Skip to content

Commit

Permalink
Merge pull request #80 from deepanshs/djs/dependency_update
Browse files Browse the repository at this point in the history
Djs/remove support for py37 and update astropy dependency
  • Loading branch information
deepanshs authored Jan 11, 2024
2 parents 159ece0 + e295937 commit a08db1e
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -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**

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration-pip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 0 additions & 16 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,6 @@
Installation
============

Requirements
------------

``csdmpy`` has the following strict requirements:

- `Python <https://www.python.org>`_ 3.7 or later
- `Numpy <https://numpy.org>`_ 1.20 or later

Other requirements include:

- `requests>=2.21.0 <http://docs.python-requests.org/en/master/>`_
(for downloading files from server)
- `astropy>=3.0 <http://www.astropy.org>`_ (for astropy units module)
- `matplotlib>=3.0 <https://matplotlib.org>`_ (for rendering plots)


Installing ``csdmpy``
---------------------

Expand Down
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
numpy>=1.20
matplotlib>=3.3.3
astropy<=5.1
astropy>=5.1
numexpr==2.8.4

setuptools>=27.3
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ setuptools>=27.3
numexpr==2.8.4

# for units
astropy<=5.1
astropy>=5.1

# Dependencies of requests package
requests>=2.21.0
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ setuptools>=27.3
numexpr==2.8.4

# for units
astropy<=5.1
astropy>=5.1

# Dependencies of requests package
requests>=2.21.0
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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",
],
)
2 changes: 1 addition & 1 deletion tests/nmr_freq_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit a08db1e

Please sign in to comment.