Merge pull request #185 from punch-mission/fix-numpy

pin versions of numpy
punch-mission · Jun 19, 2024 · 016c363 · 016c363
2 parents 9e36c09 + 134de8c
commit 016c363
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 32 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,40 +1,14 @@
 [build-system]
-requires = ["setuptools", "wheel", "numpy>=1.19.0", "Cython>=0.29.21"]
+requires = ["setuptools", "wheel", "numpy>=1.19.0, <2.0.0", "Cython>=0.29.21"]
 build-backend = "setuptools.build_meta"
 
 [tool.ruff]
-#extend-select = ['W',
-#                'C901',
-#                'I',
-#                'N',
-#                'YTT',
-#                'ANN',
-#                'S',
-#                'BLE',
-#                'B',
-#                'A',
-#                'C4',
-#                'ICN',
-#                'INP',
-#                'PIE',
-#                'T20',
-#                'PT',
-#                'Q',
-#                'RSE',
-#                'RET',
-#                'SLF',
-#                'SIM',
-#                'TID',
-#                'ARG',
-#                'PGH',
-#                'TRY',
-#                'NPY',
-#                'RUF']
-#target-version = 'py38'
-#ignore = ['ANN101', 'ANN102', 'TRY003', 'RET505', 'ANN401', 'RET506', 'W291']
 exclude = ['tests/*']
 line-length=120
 
+#[tool.ruff.lint]
+#select = ["NPY201"]
+
 [tool.isort]
 balanced_wrapping = true
 default_section = "THIRDPARTY"

diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@
 setup(
     name="regularizepsf",
     python_requires=">=3.10",
-    version="0.3.3",
+    version="0.3.4",
     description="Point spread function modeling and regularization",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -22,7 +22,17 @@
     author="J. Marcus Hughes",
     author_email="[email protected]",
     ext_modules=cythonize(ext_modules, annotate=True, compiler_directives={"language_level": 3}),
-    install_requires=["numpy", "dill", "h5py", "lmfit", "sep", "cython", "astropy", "scipy", "scikit-image", "matplotlib", "setuptools"],
+    install_requires=["numpy==1.26.4",
+                      "dill",
+                      "h5py",
+                      "lmfit",
+                      "sep",
+                      "cython",
+                      "astropy",
+                      "scipy",
+                      "scikit-image",
+                      "matplotlib",
+                      "setuptools"],
     package_data={"regularizepsf": ["helper.pyx"]},
     setup_requires=["cython"],
     extras_require={"test": ["pytest",