From 313d4db0fb81ec4c080425eb7c05e78dff317d97 Mon Sep 17 00:00:00 2001 From: deepanshs <21365911+deepanshs@users.noreply.github.com> Date: Thu, 11 Jan 2024 03:28:03 -0500 Subject: [PATCH 1/4] drop support for py3.7 --- .github/ISSUE_TEMPLATE/bug_report.md | 4 ++-- .github/workflows/continuous-integration-pip.yml | 2 +- docs/installation.rst | 16 ---------------- setup.py | 4 ++-- 4 files changed, 5 insertions(+), 21 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 6615d9e..296b1b3 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -30,8 +30,8 @@ If applicable, add screenshots to help explain your problem. **Desktop (please complete the following information):** - OS: [e.g. macOS] -- Python version: [e.g. 3.7.1] -- `csdmpy` version: [e.g. 0.3] +- Python version: [e.g. 3.10.1] +- `csdmpy` version: [e.g. 0.6] **Additional context** diff --git a/.github/workflows/continuous-integration-pip.yml b/.github/workflows/continuous-integration-pip.yml index 45dc3cf..b8f6a2e 100644 --- a/.github/workflows/continuous-integration-pip.yml +++ b/.github/workflows/continuous-integration-pip.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.8, 3.9, "3.10", "3.11"] + python-version: [3.8, 3.9, "3.10", "3.11", "3.12"] steps: - name: Checkout diff --git a/docs/installation.rst b/docs/installation.rst index 094ac9f..35efa72 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -2,22 +2,6 @@ Installation ============ -Requirements ------------- - -``csdmpy`` has the following strict requirements: - -- `Python `_ 3.7 or later -- `Numpy `_ 1.20 or later - -Other requirements include: - -- `requests>=2.21.0 `_ - (for downloading files from server) -- `astropy>=3.0 `_ (for astropy units module) -- `matplotlib>=3.0 `_ (for rendering plots) - - Installing ``csdmpy`` --------------------- diff --git a/setup.py b/setup.py index 464eded..2c0b96f 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ long_description_content_type="text/markdown", author="Deepansh Srivastava", author_email="srivastava.89@osu.edu", - python_requires=">=3.7", + python_requires=">=3.8", url="https://github.com/DeepanshS/csdmpy/", packages=find_packages(), install_requires=required, @@ -60,11 +60,11 @@ "License :: OSI Approved :: BSD License", "Programming Language :: Python", "Programming Language :: Python :: 3", - "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", + "Programming Language :: Python :: 3.12", "Topic :: Scientific/Engineering", ], ) From 824c498e91f59a1e51a362cccbb41119453cb0c9 Mon Sep 17 00:00:00 2001 From: deepanshs <21365911+deepanshs@users.noreply.github.com> Date: Thu, 11 Jan 2024 03:28:28 -0500 Subject: [PATCH 2/4] astropy version update --- docs/requirements.txt | 2 +- requirements-dev.txt | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 93eaeeb..b198822 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,6 +1,6 @@ numpy>=1.20 matplotlib>=3.3.3 -astropy<=5.1 +astropy>=6.0 numexpr==2.8.4 setuptools>=27.3 diff --git a/requirements-dev.txt b/requirements-dev.txt index 3232ed6..f4b7ac5 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,7 +4,7 @@ setuptools>=27.3 numexpr==2.8.4 # for units -astropy<=5.1 +astropy>=6.0 # Dependencies of requests package requests>=2.21.0 diff --git a/requirements.txt b/requirements.txt index 7598d5d..7cd5deb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ setuptools>=27.3 numexpr==2.8.4 # for units -astropy<=5.1 +astropy>=6.0 # Dependencies of requests package requests>=2.21.0 From ea785499ea834eb97395094010d54fd6fbbbfc50 Mon Sep 17 00:00:00 2001 From: deepanshs <21365911+deepanshs@users.noreply.github.com> Date: Thu, 11 Jan 2024 03:32:22 -0500 Subject: [PATCH 3/4] update astropy version --- docs/requirements.txt | 2 +- requirements-dev.txt | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index b198822..b83af81 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,6 +1,6 @@ numpy>=1.20 matplotlib>=3.3.3 -astropy>=6.0 +astropy>=5.1 numexpr==2.8.4 setuptools>=27.3 diff --git a/requirements-dev.txt b/requirements-dev.txt index f4b7ac5..6ed56c1 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,7 +4,7 @@ setuptools>=27.3 numexpr==2.8.4 # for units -astropy>=6.0 +astropy>=5.1 # Dependencies of requests package requests>=2.21.0 diff --git a/requirements.txt b/requirements.txt index 7cd5deb..6326383 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ setuptools>=27.3 numexpr==2.8.4 # for units -astropy>=6.0 +astropy>=5.1 # Dependencies of requests package requests>=2.21.0 From e295937d6e62513b90dde5a53eade5efc3000150 Mon Sep 17 00:00:00 2001 From: deepanshs <21365911+deepanshs@users.noreply.github.com> Date: Thu, 11 Jan 2024 03:36:33 -0500 Subject: [PATCH 4/4] lint --- tests/nmr_freq_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/nmr_freq_test.py b/tests/nmr_freq_test.py index aa5ec5c..d4c19cc 100644 --- a/tests/nmr_freq_test.py +++ b/tests/nmr_freq_test.py @@ -15,7 +15,7 @@ def setup_reference_offset(offset): assert np.allclose(b.coordinates, array) assert b.get_nmr_reference_offset() == offset - b = cp.LinearDimension(count=6, increment="-1", coordinates_offset=f"{2+offset}") + b = cp.LinearDimension(count=6, increment="-1", coordinates_offset=f"{2 + offset}") assert np.allclose(b.coordinates, np.asarray([2, 1, 0, -1, -2, -3]) + offset) assert b.get_nmr_reference_offset() == offset