From be6ec32e4432a0fe6ee4e573b0a06c04c3c396a4 Mon Sep 17 00:00:00 2001 From: Evgeny Prilepin Date: Tue, 5 Oct 2021 10:41:59 +0100 Subject: [PATCH 1/5] update deps, add py310 to CI --- .github/workflows/main.yaml | 2 +- setup.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 8484dea..e580bb3 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -16,7 +16,7 @@ jobs: - ubuntu-latest - macos-latest - windows-latest - python-version: [ 3.6, 3.7, 3.8, 3.9 ] + python-version: [ 3.6, 3.7, 3.8, 3.9, 3.10 ] steps: - uses: actions/checkout@v2 diff --git a/setup.py b/setup.py index 6f63e98..cf7c031 100644 --- a/setup.py +++ b/setup.py @@ -29,8 +29,8 @@ def _get_long_description(): packages=['csaps'], python_requires='>=3.6, <4', install_requires=[ - 'numpy >=1.11.0, <1.22.0', - 'scipy >=1.0.0, <1.8.0', + 'numpy >=1.11.0, <2', + 'scipy >=1.0.0, <2', ], extras_require={ 'docs': ['sphinx >=3.0.0, <5', 'matplotlib >=3.1', 'numpydoc', 'm2r2'], @@ -64,6 +64,7 @@ def _get_long_description(): 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: Implementation :: CPython', ], ) From 33710e840e96a980fe8aeeb0ea4f1c2de91c5693 Mon Sep 17 00:00:00 2001 From: Evgeny Prilepin Date: Tue, 5 Oct 2021 10:48:34 +0100 Subject: [PATCH 2/5] try to fix "3.10" definition in build matrix --- .github/workflows/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index e580bb3..3bb21ce 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -16,7 +16,7 @@ jobs: - ubuntu-latest - macos-latest - windows-latest - python-version: [ 3.6, 3.7, 3.8, 3.9, 3.10 ] + python-version: [ 3.6, 3.7, 3.8, 3.9, "3.10" ] steps: - uses: actions/checkout@v2 From 967cb87b97885349781d7358a5350572cd9326ae Mon Sep 17 00:00:00 2001 From: Evgeny Prilepin Date: Tue, 5 Oct 2021 10:57:37 +0100 Subject: [PATCH 3/5] use explicit strings for python versions --- .github/workflows/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 3bb21ce..a27cffd 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -16,7 +16,7 @@ jobs: - ubuntu-latest - macos-latest - windows-latest - python-version: [ 3.6, 3.7, 3.8, 3.9, "3.10" ] + python-version: [ "3.6", "3.7", "3.8", "3.9", "3.10" ] steps: - uses: actions/checkout@v2 From 307f9754b30baef62229fa4f8038a2e14ba74c57 Mon Sep 17 00:00:00 2001 From: Evgeny Prilepin Date: Tue, 5 Oct 2021 11:00:33 +0100 Subject: [PATCH 4/5] disable 3.10 temporarily --- .github/workflows/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index a27cffd..8e9cb96 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -16,7 +16,7 @@ jobs: - ubuntu-latest - macos-latest - windows-latest - python-version: [ "3.6", "3.7", "3.8", "3.9", "3.10" ] + python-version: [ "3.6", "3.7", "3.8", "3.9" ] # "3.10" -- currently disabled steps: - uses: actions/checkout@v2 From 78c6e8792c641f6253371d3c3e394bea7dd3ae9d Mon Sep 17 00:00:00 2001 From: Evgeny Prilepin Date: Tue, 5 Oct 2021 11:06:49 +0100 Subject: [PATCH 5/5] update left edge of numpy dependency version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index cf7c031..b441bb9 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ def _get_long_description(): packages=['csaps'], python_requires='>=3.6, <4', install_requires=[ - 'numpy >=1.11.0, <2', + 'numpy >=1.12.0, <2', 'scipy >=1.0.0, <2', ], extras_require={