From 8b5af15c4a7c11afcf4cf0052eaa6fe70d0be887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Troj=C3=A1k?= Date: Mon, 20 Feb 2023 16:32:39 +0100 Subject: [PATCH 1/4] Update environment-dev.yml --- conda/environment-dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/environment-dev.yml b/conda/environment-dev.yml index 5f82d29..2fab0c9 100644 --- a/conda/environment-dev.yml +++ b/conda/environment-dev.yml @@ -7,7 +7,7 @@ dependencies: - autopep8 - numpy - matchms >=0.14.0 - - pint >= 0.17 + - pint >=0.17,<0.20 - pip - pandas - prospector @@ -19,4 +19,4 @@ dependencies: - build - twine - pip: - - -e ..[dev] \ No newline at end of file + - -e ..[dev] From 03ab931f3fde6135f36ac618a613624bfdc51349 Mon Sep 17 00:00:00 2001 From: Matej Trojak Date: Tue, 21 Feb 2023 09:25:02 +0100 Subject: [PATCH 2/4] Pin pint dependency in also in other env files --- conda/environment.yml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/environment.yml b/conda/environment.yml index c42cfde..d1f1acb 100644 --- a/conda/environment.yml +++ b/conda/environment.yml @@ -7,6 +7,6 @@ dependencies: - numpy - matchms >=0.14.0 - pandas - - pint >= 0.17 + - pint >=0.17,<0.20 - python >=3.7 - scipy diff --git a/setup.py b/setup.py index ad0448f..c74947d 100644 --- a/setup.py +++ b/setup.py @@ -50,7 +50,7 @@ "matchms>=0.14.0", "numpy", "pandas", - "pint>=0.17", + "pint>=0.17,<0.20", "scipy" ], extras_require={ From f1e76258084f2211023eb56311e242ba117a20e0 Mon Sep 17 00:00:00 2001 From: Matej Trojak Date: Tue, 21 Feb 2023 09:35:25 +0100 Subject: [PATCH 3/4] Pin matchms dependency --- conda/environment-dev.yml | 2 +- conda/environment.yml | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conda/environment-dev.yml b/conda/environment-dev.yml index 2fab0c9..f6b90ab 100644 --- a/conda/environment-dev.yml +++ b/conda/environment-dev.yml @@ -6,7 +6,7 @@ channels: dependencies: - autopep8 - numpy - - matchms >=0.14.0 + - matchms >=0.14.0,<0.18.0 - pint >=0.17,<0.20 - pip - pandas diff --git a/conda/environment.yml b/conda/environment.yml index d1f1acb..3c041d4 100644 --- a/conda/environment.yml +++ b/conda/environment.yml @@ -5,7 +5,7 @@ channels: - defaults dependencies: - numpy - - matchms >=0.14.0 + - matchms >=0.14.0,<0.18.0 - pandas - pint >=0.17,<0.20 - python >=3.7 diff --git a/setup.py b/setup.py index c74947d..94c1633 100644 --- a/setup.py +++ b/setup.py @@ -47,7 +47,7 @@ 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,<0.20", From 1597fcb039e4f78f6912f088bd702963fae05ce8 Mon Sep 17 00:00:00 2001 From: Matej Trojak Date: Tue, 21 Feb 2023 10:22:42 +0100 Subject: [PATCH 4/4] Update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aea09b6..fcc324a 100644 --- 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