Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Python vers update #43

Merged
merged 17 commits into from
Nov 22, 2023
Merged

Python vers update #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5923583
fixed typo in make_primitive example
andyx13 Nov 14, 2023
a713a05
Update python version support to 3.11
andyx13 Nov 20, 2023
4d34481
python 3.9 support test
andyx13 Nov 20, 2023
548e59d
increased min reqs, dropping 3.6/3.7
andyx13 Nov 20, 2023
097d9e1
increased pytest requirement
andyx13 Nov 20, 2023
cff0167
try specific package dependencies
andyx13 Nov 20, 2023
70d11f2
fix python vers for 3.9 support test
andyx13 Nov 20, 2023
b5c004d
generalize pandas/numpy/scipy ver
andyx13 Nov 21, 2023
f52c62b
generalize pytest version
andyx13 Nov 21, 2023
53846d2
remove 3.10
andyx13 Nov 21, 2023
3f048c3
allow version 3.10
andyx13 Nov 21, 2023
7c9ceab
allow version 3.10 (#2)
andyx13 Nov 21, 2023
0980bbf
3.10 unit test
andyx13 Nov 21, 2023
a86a115
quote 3.10 to avoid parsing as 3.1
andyx13 Nov 21, 2023
babf659
3.11 support (#1)
andyx13 Nov 21, 2023
1c912c8
3.11 support (#2)
andyx13 Nov 21, 2023
8aaca9f
modify setup.py to show supported python versions
andyx13 Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [3.6, 3.7, 3.8]
python-version: ['3.8', '3.9', '3.10', '3.11']
os: [ubuntu-20.04]
steps:
- uses: actions/checkout@v1
Expand All @@ -47,7 +47,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [3.6, 3.7, 3.8]
python-version: ['3.8', '3.9', '3.10', '3.11']
os: [ubuntu-20.04, macos-latest, windows-latest]
steps:
- uses: actions/checkout@v1
Expand All @@ -68,7 +68,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [3.6, 3.7, 3.8]
python-version: ['3.8', '3.9', '3.10', '3.11']
os: [ubuntu-20.04, macos-latest]
steps:
- uses: actions/checkout@v1
Expand Down
2 changes: 1 addition & 1 deletion DEVELOPMENT.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, SFS3 # SFS2 can be changed to SFS3 if supporting >=3.6

[isort]
include_trailing_comment = True
Expand Down
21 changes: 11 additions & 10 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@
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 = [
'pytest-runner>=2.11.1',
]

tests_require = [
'pytest>=3.4.2',
'pytest-cov>=2.6.0',
'pytest>=7.2.2',
'pytest-cov>=4.1.0',
'jupyter>=1.0.0,<2',
'rundoc>=0.4.3,<0.5',
]
Expand Down Expand Up @@ -75,9 +75,10 @@
'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.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={
Expand All @@ -97,7 +98,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.12',
setup_requires=setup_requires,
test_suite='tests',
tests_require=tests_require,
Expand Down
12 changes: 7 additions & 5 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
[tox]
envlist = py3{6,7,8}-{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
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

[testenv]
passenv = CI TRAVIS TRAVIS_*
Expand Down
Loading