Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • bug_test_instfreqplot_arm64
  • bug_test_tfplot
  • bugs_i686
  • ci39
  • ci39-python12
  • debian
  • endianness
  • gitlab-ci
  • issue#14
  • master
  • py39
  • v1.0.0
  • v1.0.12
  • v1.0.13
  • v1.0.14
  • v1.0.15
  • v1.0.16
  • v1.0.17
  • v1.0.6
  • v1.0.7
  • v1.0.8
  • v1.0.9
22 results

Target

Select target project
  • dev/ltfatpy
1 result
Select Git revision
  • bug_test_instfreqplot_arm64
  • bug_test_tfplot
  • bugs_i686
  • ci39
  • ci39-python12
  • debian
  • endianness
  • gitlab-ci
  • issue#14
  • master
  • py39
  • v1.0.0
  • v1.0.12
  • v1.0.13
  • v1.0.14
  • v1.0.15
  • v1.0.16
  • v1.0.17
  • v1.0.6
  • v1.0.7
  • v1.0.8
  • v1.0.9
22 results
Show changes
Commits on Source (7)
Showing
with 66901 additions and 42491 deletions
......@@ -93,4 +93,5 @@ LtfatPyt.egg-info/
.cache/
dist/
MANIFEST
.venv/
......@@ -89,9 +89,21 @@ install_and_test_311:
paths:
- build
expire_in: 8d
only:
- ci39-python12
install_and_test_312:
image: registry.lis-lab.fr:5005/dev/ltfatpy/python-ci:3.12
stage: test
before_script:
- echo "image registry 3.12"
script:
- pip3 install -e .
- python3 -m pytest
artifacts:
when: always
untracked: true
paths:
- build
expire_in: 8d
# Tests on X86_64 ubuntu
ubuntu:X86_64:
......
ltfatpy:1.0.17
ltfatpy:1.1.0
ltfat:2.1.0
......@@ -30,7 +30,7 @@ synthesis.
Version
-------
* ltfatpy version = 1.0.17
* ltfatpy version = 1.1.0
* LTFAT version = 2.1.0
Licence
......
......@@ -21,7 +21,7 @@ To install **CMake** follow the instructions given `here <https://cmake.org/inst
Python
------
* Make sure you have **python** >= 2.7 installed. If not follow the instructions from `here <https://wiki.python.org/moin/BeginnersGuide/Download>`__.
* Make sure you have **python** >= 3.4 installed. If not follow the instructions from `here <https://wiki.python.org/moin/BeginnersGuide/Download>`__.
* According to your python version, make sure you have **pip** installed. If not follow the instructions from `here <https://pip.pypa.io/en/stable/installing/>`__.
For developpers only:
......@@ -120,7 +120,7 @@ Some needed dependencies are not provided in the main anaconda channel, but they
These dependencies can be installed with the following commands::
conda install cmake make fftw cython six nomkl numpy scipy matplotlib
conda install cmake make fftw cython nomkl numpy scipy matplotlib
conda install -c conda-forge lapack openblas
The **ltfatpy** package can then be installed using pip::
......
# Dockerfile
ARG PYTHON_VERSION=3.11
FROM python:${PYTHON_VERSION}-slim
RUN apt-get update && \
apt-get install -y --no-install-recommends \
cmake \
gcc \
g++ \
make \
libfftw3-dev \
liblapack-dev \
libjs-jquery-hotkeys \
libjs-jquery-isonscreen \
libjs-jquery-tablesorter \
texlive-latex-extra \
dvipng \
python3-tk \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
RUN pip install --upgrade pip \
&& pip install virtualenv \
&& virtualenv /venv \
&& /venv/bin/pip install matplotlib numpy scipy six coverage pytest pytest-cov
ENV PATH="/venv/bin:$PATH"
#!/bin/bash
# "3.7" "3.10"
PYTHON_VERSIONS=("3.11" "3.12")
GITLAB_REGISTRY="registry.lis-lab.fr:5005/dev/ltfatpy"
for version in "${PYTHON_VERSIONS[@]}"; do
echo "Building Python $version..."
docker build --build-arg PYTHON_VERSION=$version -t "$GITLAB_REGISTRY/python-ci:$version" .
docker push "$GITLAB_REGISTRY/python-ci:$version"
done
......@@ -32,7 +32,7 @@
# Version
# -------
#
# * ltfatpy version = 1.0.17
# * ltfatpy version = 1.1.0
# * LTFAT version = 2.1.0
#
# Licence
......@@ -171,4 +171,4 @@ __all__ = ["arg_firwin", "assert_groworder", "assert_sigreshape_post",
"long2fir", "normalize", "rms", "thresh", "lcm", "postpad"]
__version__ = "1.0.17"
__version__ = "1.1.0"
......@@ -32,7 +32,7 @@
# Version
# -------
#
# * ltfatpy version = 1.0.17
# * ltfatpy version = 1.1.0
# * LTFAT version = 2.1.0
#
# Licence
......
......@@ -32,7 +32,7 @@
# Version
# -------
#
# * ltfatpy version = 1.0.17
# * ltfatpy version = 1.1.0
# * LTFAT version = 2.1.0
#
# Licence
......
......@@ -32,7 +32,7 @@
# Version
# -------
#
# * ltfatpy version = 1.0.17
# * ltfatpy version = 1.1.0
# * LTFAT version = 2.1.0
#
# Licence
......
......@@ -32,7 +32,7 @@
# Version
# -------
#
# * ltfatpy version = 1.0.17
# * ltfatpy version = 1.1.0
# * LTFAT version = 2.1.0
#
# Licence
......@@ -62,11 +62,8 @@ Ported from ltfat_2.1.0/comp/assert_sigreshape_pre.m
Florent Jaillet
"""
from __future__ import print_function, division
import numpy as np
import sys
import six
def assert_sigreshape_pre(f, L=None, dim=None):
......@@ -116,7 +113,7 @@ def assert_sigreshape_pre(f, L=None, dim=None):
# ---- We have a vector, find the dimension where it lives.
dim = [i for i, v in enumerate(f.shape) if v > 1][0]
else:
if (not isinstance(dim, six.integer_types) and
if (not isinstance(dim, int) and
not isinstance(dim, np.int_)):
raise TypeError("dim should be an integer.")
if dim < 0 or dim > D:
......@@ -124,7 +121,7 @@ def assert_sigreshape_pre(f, L=None, dim=None):
"{0:d}.".format(D-1))
if L is not None:
if not isinstance(L, six.integer_types):
if not isinstance(L, int):
raise TypeError("L should be an integer.")
if dim > 0:
......
This diff is collapsed.
......@@ -32,7 +32,7 @@
# Version
# -------
#
# * ltfatpy version = 1.0.17
# * ltfatpy version = 1.1.0
# * LTFAT version = 2.1.0
#
# Licence
......
This diff is collapsed.
......@@ -32,7 +32,7 @@
# Version
# -------
#
# * ltfatpy version = 1.0.17
# * ltfatpy version = 1.1.0
# * LTFAT version = 2.1.0
#
# Licence
......
This diff is collapsed.
......@@ -32,7 +32,7 @@
# Version
# -------
#
# * ltfatpy version = 1.0.17
# * ltfatpy version = 1.1.0
# * LTFAT version = 2.1.0
#
# Licence
......
This diff is collapsed.
......@@ -32,7 +32,7 @@
# Version
# -------
#
# * ltfatpy version = 1.0.17
# * ltfatpy version = 1.1.0
# * LTFAT version = 2.1.0
#
# Licence
......