From 5923583096834fde97d812c1c4f472083e54aca2 Mon Sep 17 00:00:00 2001 From: andyx13 <39492936+andyx13@users.noreply.github.com> Date: Tue, 14 Nov 2023 00:33:41 -0500 Subject: [PATCH 01/17] fixed typo in make_primitive example --- DEVELOPMENT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 1f6ef22..ee8889f 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -418,7 +418,7 @@ you will need to pass the fixed hyperparameters specification as follows: from sigpro.contributing import make_primitive make_primitive( - 'sigpro.aggragations.frequency.band.band_mean', + 'sigpro.aggregations.frequency.band.band_mean', fixed_hyperparameters={ 'min_frequency': { 'type': 'float', From a713a054d43bc236926d392186417aa4cd522651 Mon Sep 17 00:00:00 2001 From: andyx13 <39492936+andyx13@users.noreply.github.com> Date: Mon, 20 Nov 2023 14:26:03 -0500 Subject: [PATCH 02/17] Update python version support to 3.11 --- .github/workflows/docs.yml | 2 +- .github/workflows/latest-dependencies.yml | 4 ++-- .github/workflows/tests.yml | 8 ++++---- setup.cfg | 2 +- setup.py | 7 +++++-- tox.ini | 8 +++++++- 6 files changed, 20 insertions(+), 11 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index b15bf4a..6feba94 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,7 +14,7 @@ jobs: - name: Python uses: actions/setup-python@v1 with: - python-version: 3.8 + python-version: 3.11 - name: Build run: | diff --git a/.github/workflows/latest-dependencies.yml b/.github/workflows/latest-dependencies.yml index 425c08c..6fa0d04 100644 --- a/.github/workflows/latest-dependencies.yml +++ b/.github/workflows/latest-dependencies.yml @@ -8,10 +8,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up Python 3.8 + - name: Set up Python 3.11 uses: actions/setup-python@v2 with: - python-version: 3.8 + python-version: 3.11 - name: Update dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e3e3bce..b23a8bd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.8] + python-version: [3.11] os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 @@ -29,7 +29,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.6, 3.7, 3.8] + python-version: [3.6, 3.7, 3.8, 3.9, 3.10, 3.11] os: [ubuntu-20.04] steps: - uses: actions/checkout@v1 @@ -47,7 +47,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.6, 3.7, 3.8] + python-version: [3.6, 3.7, 3.8, 3.9, 3.10, 3.11] os: [ubuntu-20.04, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 @@ -68,7 +68,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.6, 3.7, 3.8] + python-version: [3.6, 3.7, 3.8, 3.9, 3.10, 3.11] os: [ubuntu-20.04, macos-latest] steps: - uses: actions/checkout@v1 diff --git a/setup.cfg b/setup.cfg index 2cc7130..22bacd4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,7 +30,7 @@ universal = 1 [flake8] max-line-length = 99 exclude = docs, .tox, .git, __pycache__, .ipynb_checkpoints -ignore = D107, SFS2 # SFS2 can be changed to SFS3 if supporting >=3.6 +ignore = D107, SFS2 , SFS3 # SFS2 can be changed to SFS3 if supporting >=3.6 [isort] include_trailing_comment = True diff --git a/setup.py b/setup.py index 1f5126d..8f04ca3 100644 --- a/setup.py +++ b/setup.py @@ -77,7 +77,10 @@ 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', ], description='Signal Processing Tools for Machine Mearning', entry_points={ @@ -97,7 +100,7 @@ long_description_content_type='text/markdown', name='sigpro', packages=find_packages(include=['sigpro', 'sigpro.*']), - python_requires='>=3.6,<3.9', + python_requires='>=3.6,<=3.11', setup_requires=setup_requires, test_suite='tests', tests_require=tests_require, diff --git a/tox.ini b/tox.ini index 018c307..9b4a334 100644 --- a/tox.ini +++ b/tox.ini @@ -1,14 +1,20 @@ [tox] -envlist = py3{6,7,8}-{lint,readme,pytest,minimum} +envlist = py3{6,7,8,9,10,11}-{lint,readme,pytest,minimum} [travis] python = + 3.11: py311-lint, py311-readme, py311-pytest, py311-minimum, py311-tutorials + 3.10: py310-lint, py310-readme, py310-pytest, py310-minimum, py310-tutorials + 3.9: py39-lint, py39-readme, py39-pytest, py39-minimum, py39-tutorials 3.8: py38-lint, py38-readme, py38-pytest, py38-minimum, py38-tutorials 3.7: py37-lint, py37-readme, py37-pytest, py37-minimum, py37-tutorials 3.6: py36-lint, py36-readme, py36-pytest, py36-minimum, py36-tutorials [gh-actions] python = + 3.11: py311-lint, py311-readme, py311-pytest, py311-minimum, py311-tutorials + 3.10: py310-lint, py310-readme, py310-pytest, py310-minimum, py310-tutorials + 3.9: py39-lint, py39-readme, py39-pytest, py39-minimum, py39-tutorials 3.8: py38-lint, py38-readme, py38-pytest, py38-minimum, py38-tutorials 3.7: py37-lint, py37-readme, py37-pytest, py37-minimum, py37-tutorials 3.6: py36-lint, py36-readme, py36-pytest, py36-minimum, py36-tutorials From 4d34481f93c53761e05d637697511b25554d5960 Mon Sep 17 00:00:00 2001 From: andyx13 <39492936+andyx13@users.noreply.github.com> Date: Mon, 20 Nov 2023 14:40:21 -0500 Subject: [PATCH 03/17] python 3.9 support test --- .github/workflows/docs.yml | 2 +- .github/workflows/latest-dependencies.yml | 4 ++-- .github/workflows/tests.yml | 8 ++++---- setup.cfg | 2 +- setup.py | 4 +--- tox.ini | 6 +----- 6 files changed, 10 insertions(+), 16 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 6feba94..36e7e8e 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,7 +14,7 @@ jobs: - name: Python uses: actions/setup-python@v1 with: - python-version: 3.11 + python-version: 3.9 - name: Build run: | diff --git a/.github/workflows/latest-dependencies.yml b/.github/workflows/latest-dependencies.yml index 6fa0d04..4efcc24 100644 --- a/.github/workflows/latest-dependencies.yml +++ b/.github/workflows/latest-dependencies.yml @@ -8,10 +8,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up Python 3.11 + - name: Set up Python 3.9 uses: actions/setup-python@v2 with: - python-version: 3.11 + python-version: 3.9 - name: Update dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b23a8bd..29e9b1f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.11] + python-version: [3.9] os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 @@ -29,7 +29,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.6, 3.7, 3.8, 3.9, 3.10, 3.11] + python-version: [3.6, 3.7, 3.8, 3.9] os: [ubuntu-20.04] steps: - uses: actions/checkout@v1 @@ -47,7 +47,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.6, 3.7, 3.8, 3.9, 3.10, 3.11] + python-version: [3.6, 3.7, 3.8, 3.9] os: [ubuntu-20.04, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 @@ -68,7 +68,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.6, 3.7, 3.8, 3.9, 3.10, 3.11] + python-version: [3.6, 3.7, 3.8, 3.9] os: [ubuntu-20.04, macos-latest] steps: - uses: actions/checkout@v1 diff --git a/setup.cfg b/setup.cfg index 22bacd4..b99689b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,7 +30,7 @@ universal = 1 [flake8] max-line-length = 99 exclude = docs, .tox, .git, __pycache__, .ipynb_checkpoints -ignore = D107, SFS2 , SFS3 # SFS2 can be changed to SFS3 if supporting >=3.6 +ignore = D107, SFS3 # SFS2 can be changed to SFS3 if supporting >=3.6 [isort] include_trailing_comment = True diff --git a/setup.py b/setup.py index 8f04ca3..c1fe10f 100644 --- a/setup.py +++ b/setup.py @@ -79,8 +79,6 @@ 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10', - 'Programming Language :: Python :: 3.11', ], description='Signal Processing Tools for Machine Mearning', entry_points={ @@ -100,7 +98,7 @@ long_description_content_type='text/markdown', name='sigpro', packages=find_packages(include=['sigpro', 'sigpro.*']), - python_requires='>=3.6,<=3.11', + python_requires='>=3.6,<=3.9', setup_requires=setup_requires, test_suite='tests', tests_require=tests_require, diff --git a/tox.ini b/tox.ini index 9b4a334..0bba1f1 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,8 @@ [tox] -envlist = py3{6,7,8,9,10,11}-{lint,readme,pytest,minimum} +envlist = py3{6,7,8,9}-{lint,readme,pytest,minimum} [travis] python = - 3.11: py311-lint, py311-readme, py311-pytest, py311-minimum, py311-tutorials - 3.10: py310-lint, py310-readme, py310-pytest, py310-minimum, py310-tutorials 3.9: py39-lint, py39-readme, py39-pytest, py39-minimum, py39-tutorials 3.8: py38-lint, py38-readme, py38-pytest, py38-minimum, py38-tutorials 3.7: py37-lint, py37-readme, py37-pytest, py37-minimum, py37-tutorials @@ -12,8 +10,6 @@ python = [gh-actions] python = - 3.11: py311-lint, py311-readme, py311-pytest, py311-minimum, py311-tutorials - 3.10: py310-lint, py310-readme, py310-pytest, py310-minimum, py310-tutorials 3.9: py39-lint, py39-readme, py39-pytest, py39-minimum, py39-tutorials 3.8: py38-lint, py38-readme, py38-pytest, py38-minimum, py38-tutorials 3.7: py37-lint, py37-readme, py37-pytest, py37-minimum, py37-tutorials From 548e59d950f0a5b4416c039a33a284ca5fcd69da Mon Sep 17 00:00:00 2001 From: andyx13 <39492936+andyx13@users.noreply.github.com> Date: Mon, 20 Nov 2023 15:09:49 -0500 Subject: [PATCH 04/17] increased min reqs, dropping 3.6/3.7 --- .github/workflows/docs.yml | 2 +- .github/workflows/tests.yml | 8 ++++---- setup.py | 12 +++++------- tox.ini | 6 +----- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 36e7e8e..b15bf4a 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,7 +14,7 @@ jobs: - name: Python uses: actions/setup-python@v1 with: - python-version: 3.9 + python-version: 3.8 - name: Build run: | diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 29e9b1f..6aed411 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.9] + python-version: [3.8] os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 @@ -29,7 +29,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [ 3.8, 3.9] os: [ubuntu-20.04] steps: - uses: actions/checkout@v1 @@ -47,7 +47,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [3.8, 3.9] os: [ubuntu-20.04, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 @@ -68,7 +68,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [ 3.8, 3.9] os: [ubuntu-20.04, macos-latest] steps: - uses: actions/checkout@v1 diff --git a/setup.py b/setup.py index c1fe10f..b286dd0 100644 --- a/setup.py +++ b/setup.py @@ -12,10 +12,10 @@ history = history_file.read() install_requires = [ - 'mlblocks>=0.4.1', - 'pandas>=1', - 'numpy>=1.17.4', - 'scipy>=1.3.3', + 'mlblocks>=0.6.1', + 'pandas>=1.5.3', + 'numpy>=1.24.4', + 'scipy>=1.10.1', ] setup_requires = [ @@ -75,8 +75,6 @@ 'License :: OSI Approved :: MIT License', 'Natural Language :: English', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', ], @@ -98,7 +96,7 @@ long_description_content_type='text/markdown', name='sigpro', packages=find_packages(include=['sigpro', 'sigpro.*']), - python_requires='>=3.6,<=3.9', + python_requires='>=3.8,<=3.9', setup_requires=setup_requires, test_suite='tests', tests_require=tests_require, diff --git a/tox.ini b/tox.ini index 0bba1f1..3102943 100644 --- a/tox.ini +++ b/tox.ini @@ -1,19 +1,15 @@ [tox] -envlist = py3{6,7,8,9}-{lint,readme,pytest,minimum} +envlist = py3{8,9}-{lint,readme,pytest,minimum} [travis] python = 3.9: py39-lint, py39-readme, py39-pytest, py39-minimum, py39-tutorials 3.8: py38-lint, py38-readme, py38-pytest, py38-minimum, py38-tutorials - 3.7: py37-lint, py37-readme, py37-pytest, py37-minimum, py37-tutorials - 3.6: py36-lint, py36-readme, py36-pytest, py36-minimum, py36-tutorials [gh-actions] python = 3.9: py39-lint, py39-readme, py39-pytest, py39-minimum, py39-tutorials 3.8: py38-lint, py38-readme, py38-pytest, py38-minimum, py38-tutorials - 3.7: py37-lint, py37-readme, py37-pytest, py37-minimum, py37-tutorials - 3.6: py36-lint, py36-readme, py36-pytest, py36-minimum, py36-tutorials [testenv] passenv = CI TRAVIS TRAVIS_* From 097d9e1591e2942cb8ef75389df3918052fbcf72 Mon Sep 17 00:00:00 2001 From: andyx13 <39492936+andyx13@users.noreply.github.com> Date: Mon, 20 Nov 2023 15:26:59 -0500 Subject: [PATCH 05/17] increased pytest requirement --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b286dd0..028e33d 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ ] tests_require = [ - 'pytest>=3.4.2', + 'pytest>=6.0.0', 'pytest-cov>=2.6.0', 'jupyter>=1.0.0,<2', 'rundoc>=0.4.3,<0.5', From cff0167e1e50113280f1beb034634e40090b69aa Mon Sep 17 00:00:00 2001 From: andyx13 <39492936+andyx13@users.noreply.github.com> Date: Mon, 20 Nov 2023 17:42:35 -0500 Subject: [PATCH 06/17] try specific package dependencies --- .github/workflows/latest-dependencies.yml | 4 ++-- setup.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/latest-dependencies.yml b/.github/workflows/latest-dependencies.yml index 4efcc24..425c08c 100644 --- a/.github/workflows/latest-dependencies.yml +++ b/.github/workflows/latest-dependencies.yml @@ -8,10 +8,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up Python 3.9 + - name: Set up Python 3.8 uses: actions/setup-python@v2 with: - python-version: 3.9 + python-version: 3.8 - name: Update dependencies run: | python -m pip install --upgrade pip diff --git a/setup.py b/setup.py index 028e33d..2f57b2d 100644 --- a/setup.py +++ b/setup.py @@ -13,9 +13,9 @@ install_requires = [ 'mlblocks>=0.6.1', - 'pandas>=1.5.3', - 'numpy>=1.24.4', - 'scipy>=1.10.1', + 'pandas==1.5.3', + 'numpy==1.24.4', + 'scipy==1.10.1', ] setup_requires = [ @@ -23,8 +23,8 @@ ] tests_require = [ - 'pytest>=6.0.0', - 'pytest-cov>=2.6.0', + 'pytest==7.4.3', + 'pytest-cov>=4.1.0', 'jupyter>=1.0.0,<2', 'rundoc>=0.4.3,<0.5', ] From 70d11f2e33d8f06dff7f25f629d3cddb710c5f42 Mon Sep 17 00:00:00 2001 From: andyx13 <39492936+andyx13@users.noreply.github.com> Date: Mon, 20 Nov 2023 17:44:14 -0500 Subject: [PATCH 07/17] fix python vers for 3.9 support test --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2f57b2d..b282f4b 100644 --- a/setup.py +++ b/setup.py @@ -96,7 +96,7 @@ long_description_content_type='text/markdown', name='sigpro', packages=find_packages(include=['sigpro', 'sigpro.*']), - python_requires='>=3.8,<=3.9', + python_requires='>=3.8,<3.10', setup_requires=setup_requires, test_suite='tests', tests_require=tests_require, From b5c004d7e8664a6ceffe65bd1fbae56260f9bf01 Mon Sep 17 00:00:00 2001 From: andyx13 <39492936+andyx13@users.noreply.github.com> Date: Mon, 20 Nov 2023 19:58:48 -0500 Subject: [PATCH 08/17] generalize pandas/numpy/scipy ver --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index b282f4b..58bd8bc 100644 --- a/setup.py +++ b/setup.py @@ -13,9 +13,9 @@ install_requires = [ 'mlblocks>=0.6.1', - 'pandas==1.5.3', - 'numpy==1.24.4', - 'scipy==1.10.1', + 'pandas>=1.5.3', + 'numpy>=1.24.4', + 'scipy>=1.10.1', ] setup_requires = [ From f52c62bcc6b5c67897b2096af052ee7255313de1 Mon Sep 17 00:00:00 2001 From: andyx13 <39492936+andyx13@users.noreply.github.com> Date: Mon, 20 Nov 2023 21:28:23 -0500 Subject: [PATCH 09/17] generalize pytest version --- .github/workflows/tests.yml | 2 +- setup.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6aed411..455a957 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -47,7 +47,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.8, 3.9] + python-version: [3.8, 3.9, 3.10] os: [ubuntu-20.04, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 diff --git a/setup.py b/setup.py index 58bd8bc..a88bba2 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ ] tests_require = [ - 'pytest==7.4.3', + 'pytest>=7.2.2', 'pytest-cov>=4.1.0', 'jupyter>=1.0.0,<2', 'rundoc>=0.4.3,<0.5', @@ -77,6 +77,7 @@ 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', ], description='Signal Processing Tools for Machine Mearning', entry_points={ @@ -96,7 +97,7 @@ long_description_content_type='text/markdown', name='sigpro', packages=find_packages(include=['sigpro', 'sigpro.*']), - python_requires='>=3.8,<3.10', + python_requires='>=3.8,<3.11', setup_requires=setup_requires, test_suite='tests', tests_require=tests_require, From 53846d250031b244434cec14f0e3902f30c14267 Mon Sep 17 00:00:00 2001 From: andyx13 <39492936+andyx13@users.noreply.github.com> Date: Mon, 20 Nov 2023 21:50:00 -0500 Subject: [PATCH 10/17] remove 3.10 --- .github/workflows/tests.yml | 2 +- setup.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 455a957..6aed411 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -47,7 +47,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.8, 3.9, 3.10] + python-version: [3.8, 3.9] os: [ubuntu-20.04, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 diff --git a/setup.py b/setup.py index a88bba2..d880ac0 100644 --- a/setup.py +++ b/setup.py @@ -77,7 +77,6 @@ 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10', ], description='Signal Processing Tools for Machine Mearning', entry_points={ @@ -97,7 +96,7 @@ long_description_content_type='text/markdown', name='sigpro', packages=find_packages(include=['sigpro', 'sigpro.*']), - python_requires='>=3.8,<3.11', + python_requires='>=3.8,<3.10', setup_requires=setup_requires, test_suite='tests', tests_require=tests_require, From 3f048c3a8e2dfdd080ade119d532ed2171968daf Mon Sep 17 00:00:00 2001 From: andyx13 <39492936+andyx13@users.noreply.github.com> Date: Mon, 20 Nov 2023 22:03:08 -0500 Subject: [PATCH 11/17] allow version 3.10 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d880ac0..395852a 100644 --- a/setup.py +++ b/setup.py @@ -96,7 +96,7 @@ long_description_content_type='text/markdown', name='sigpro', packages=find_packages(include=['sigpro', 'sigpro.*']), - python_requires='>=3.8,<3.10', + python_requires='>=3.8,<3.11', setup_requires=setup_requires, test_suite='tests', tests_require=tests_require, From 7c9ceabfd230483b5de485e37966a5f507d03c51 Mon Sep 17 00:00:00 2001 From: andyx13 <39492936+andyx13@users.noreply.github.com> Date: Mon, 20 Nov 2023 22:06:50 -0500 Subject: [PATCH 12/17] allow version 3.10 (#2) --- tox.ini | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 3102943..97fa222 100644 --- a/tox.ini +++ b/tox.ini @@ -1,13 +1,15 @@ [tox] -envlist = py3{8,9}-{lint,readme,pytest,minimum} +envlist = py3{8,9,10}-{lint,readme,pytest,minimum} [travis] python = + 3.10: py310-lint, py310-readme, py310-pytest, py310-minimum, py310-tutorials 3.9: py39-lint, py39-readme, py39-pytest, py39-minimum, py39-tutorials 3.8: py38-lint, py38-readme, py38-pytest, py38-minimum, py38-tutorials [gh-actions] python = + 3.10: py310-lint, py310-readme, py310-pytest, py310-minimum, py310-tutorials 3.9: py39-lint, py39-readme, py39-pytest, py39-minimum, py39-tutorials 3.8: py38-lint, py38-readme, py38-pytest, py38-minimum, py38-tutorials From 0980bbf0331494165c0169334e9a4c7da4b423d1 Mon Sep 17 00:00:00 2001 From: andyx13 <39492936+andyx13@users.noreply.github.com> Date: Mon, 20 Nov 2023 22:13:43 -0500 Subject: [PATCH 13/17] 3.10 unit test --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6aed411..455a957 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -47,7 +47,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.8, 3.9] + python-version: [3.8, 3.9, 3.10] os: [ubuntu-20.04, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 From a86a115dc4a5fa27a1b7358882bb54671ba430a3 Mon Sep 17 00:00:00 2001 From: andyx13 <39492936+andyx13@users.noreply.github.com> Date: Mon, 20 Nov 2023 22:16:30 -0500 Subject: [PATCH 14/17] quote 3.10 to avoid parsing as 3.1 --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 455a957..cfcfc19 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -29,7 +29,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [ 3.8, 3.9] + python-version: ['3.8', '3.9', '3.10'] os: [ubuntu-20.04] steps: - uses: actions/checkout@v1 @@ -47,7 +47,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.8, 3.9, 3.10] + python-version: ['3.8', '3.9', '3.10'] os: [ubuntu-20.04, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 @@ -68,7 +68,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [ 3.8, 3.9] + python-version: ['3.8', '3.9', '3.10'] os: [ubuntu-20.04, macos-latest] steps: - uses: actions/checkout@v1 From babf659c071714718634f25f1fe2fddb33650095 Mon Sep 17 00:00:00 2001 From: andyx13 <39492936+andyx13@users.noreply.github.com> Date: Mon, 20 Nov 2023 22:23:23 -0500 Subject: [PATCH 15/17] 3.11 support (#1) --- setup.py | 3 ++- tox.ini | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 395852a..7573377 100644 --- a/setup.py +++ b/setup.py @@ -77,6 +77,7 @@ 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', ], description='Signal Processing Tools for Machine Mearning', entry_points={ @@ -96,7 +97,7 @@ long_description_content_type='text/markdown', name='sigpro', packages=find_packages(include=['sigpro', 'sigpro.*']), - python_requires='>=3.8,<3.11', + python_requires='>=3.8,<3.12', setup_requires=setup_requires, test_suite='tests', tests_require=tests_require, diff --git a/tox.ini b/tox.ini index 97fa222..7c46d4c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,14 +1,16 @@ [tox] -envlist = py3{8,9,10}-{lint,readme,pytest,minimum} +envlist = py3{8,9,10,11}-{lint,readme,pytest,minimum} [travis] python = + 3.11: py311-lint, py311-readme, py311-pytest, py311-minimum, py311-tutorials 3.10: py310-lint, py310-readme, py310-pytest, py310-minimum, py310-tutorials 3.9: py39-lint, py39-readme, py39-pytest, py39-minimum, py39-tutorials 3.8: py38-lint, py38-readme, py38-pytest, py38-minimum, py38-tutorials [gh-actions] python = + 3.11: py311-lint, py311-readme, py311-pytest, py311-minimum, py311-tutorials 3.10: py310-lint, py310-readme, py310-pytest, py310-minimum, py310-tutorials 3.9: py39-lint, py39-readme, py39-pytest, py39-minimum, py39-tutorials 3.8: py38-lint, py38-readme, py38-pytest, py38-minimum, py38-tutorials From 1c912c881f0b313ce7e71c9524dbca058546b0df Mon Sep 17 00:00:00 2001 From: andyx13 <39492936+andyx13@users.noreply.github.com> Date: Mon, 20 Nov 2023 22:25:31 -0500 Subject: [PATCH 16/17] 3.11 support (#2) --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cfcfc19..9599e96 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -29,7 +29,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ['3.8', '3.9', '3.10'] + python-version: ['3.8', '3.9', '3.10', '3.11'] os: [ubuntu-20.04] steps: - uses: actions/checkout@v1 @@ -47,7 +47,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ['3.8', '3.9', '3.10'] + python-version: ['3.8', '3.9', '3.10', '3.11'] os: [ubuntu-20.04, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 @@ -68,7 +68,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ['3.8', '3.9', '3.10'] + python-version: ['3.8', '3.9', '3.10', '3.11'] os: [ubuntu-20.04, macos-latest] steps: - uses: actions/checkout@v1 From 8aaca9f0c683483a46aea136ea997ce7f01b53ab Mon Sep 17 00:00:00 2001 From: andyx13 <39492936+andyx13@users.noreply.github.com> Date: Mon, 20 Nov 2023 22:35:02 -0500 Subject: [PATCH 17/17] modify setup.py to show supported python versions --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 7573377..0a56e52 100644 --- a/setup.py +++ b/setup.py @@ -78,6 +78,7 @@ 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', ], description='Signal Processing Tools for Machine Mearning', entry_points={