Merge pull request #97 from RECETOX/96-fix-dependencies

Fix dependencies (pint and numpy)
RECETOX · Feb 21, 2023 · e88af8a · e88af8a
2 parents 85bacb3 + 1597fcb
commit e88af8a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 ### Removed
 
+## [0.3.4] - 2023-02-21
+### Changed
+- pinned pint >=0.17,<0.20 and matchms >=0.14.0,<0.18.0 for dependency issues
+
 ## [0.3.3] - 2022-07-22
 ### Added
 ### Changed

diff --git a/conda/environment-dev.yml b/conda/environment-dev.yml
@@ -6,8 +6,8 @@ channels:
 dependencies:
   - autopep8
   - numpy
-  - matchms >=0.14.0
-  - pint >= 0.17
+  - matchms >=0.14.0,<0.18.0
+  - pint >=0.17,<0.20
   - pip
   - pandas
   - prospector
@@ -19,4 +19,4 @@ dependencies:
   - build
   - twine
   - pip:
-    - -e ..[dev]
+    - -e ..[dev]
diff --git a/conda/environment.yml b/conda/environment.yml
@@ -5,8 +5,8 @@ channels:
   - defaults
 dependencies:
   - numpy
-  - matchms >=0.14.0
+  - matchms >=0.14.0,<0.18.0
   - pandas
-  - pint >= 0.17
+  - pint >=0.17,<0.20
   - python >=3.7
   - scipy
diff --git a/setup.py b/setup.py
@@ -47,10 +47,10 @@
     test_suite="tests",
     python_requires='>=3.7',
     install_requires=[
-        "matchms>=0.14.0",
+        "matchms>=0.14.0,<0.18.0",
         "numpy",
         "pandas",
-        "pint>=0.17",
+        "pint>=0.17,<0.20",
         "scipy"
     ],
     extras_require={