From 3cde8596265ba203fb131161b86dc91a00c43f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justus=20Sagem=C3=BCller?= Date: Wed, 7 Aug 2024 17:05:07 +0200 Subject: [PATCH 1/4] Update dependency bounds. These correspond to the lowest version with which I was able to install through Conda and run ODL examples. Probably even lower version would work, but they are not readily available anymore and probably not very interesting for users either. I have not exhaustively checked all newer versions. The dependencies we currently use for ODL development are considerably newer. --- conda/meta.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index a5320479127..c44fb1c1ef0 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -15,30 +15,30 @@ build: requirements: build: - - python - - setuptools + - python >=3.7 + - setuptools >=65.6 host: - python - setuptools - nomkl # [not win] - - future >=0.14 - - numpy >=1.13.3 - - scipy >=0.14 - - packaging >=15.0 + - future >=0.16 + - numpy >=1.19 + - scipy >=1.1 + - packaging >=17.0 run: - python - - future >=0.14 - - numpy >=1.13.3 - - scipy >=0.14 - - packaging >=15.0 - - matplotlib + - future >=0.16 + - numpy >=1.19 + - scipy >=1.1 + - packaging >=17.0 + - matplotlib >=3.4 test: requires: - nomkl # [not win] - - pytest >=3.0.3,<5.1 + - pytest >=5.4 imports: - odl commands: From eb9c873c10e7ea36bbaf2f9de7715258cfc22801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justus=20Sagem=C3=BCller?= Date: Wed, 7 Aug 2024 15:52:46 +0200 Subject: [PATCH 2/4] Update maintainers in Conda metadata. --- conda/meta.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index c44fb1c1ef0..8821028ef35 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -52,5 +52,8 @@ about: extra: maintainers: - - Jonas Adler (@adler-j) - - Holger Kohr (@kohr-h) + - Ozan Öktem (@ozanoktem) + - Justus Sagemüller (@leftaroundabout) + - Emilien Valat (@Emvlt) + # - Jonas Adler (@adler-j) + # - Holger Kohr (@kohr-h) From 255293de4b2cbf8d9c6dbc6d0c74e9a86a748444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justus=20Sagem=C3=BCller?= Date: Wed, 7 Aug 2024 17:06:40 +0200 Subject: [PATCH 3/4] Select another 0.x version for the conservative release. Version 1.0 was planned, but this should be the version with all the changes needed for Pytorch etc. compatibility. --- conda/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 8821028ef35..eb364f22fd6 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -1,6 +1,6 @@ package: name: odl - version: "1.0.0.dev" + version: "0.8.0" source: git_url: https://github.com/odlgroup/odl From 788a1af91dee82f9ee2e8427febe2ec8dacae8fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justus=20Sagem=C3=BCller?= Date: Thu, 5 Sep 2024 16:33:25 +0200 Subject: [PATCH 4/4] Update setup.cfg file. This largely reflects the changes already made in `conda/meta.yaml`, and concerns removal of obsolete Python and NumPy versions. --- setup.cfg | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/setup.cfg b/setup.cfg index b9302ff6480..b59c26c4ef8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -27,26 +27,24 @@ classifiers = Topic :: Software Development :: Libraries Topic :: Software Development :: Libraries :: Python Modules License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0) - Programming Language :: Python :: 2 - Programming Language :: Python :: 2.7 - Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 - Programming Language :: Python :: 3.6 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 Operating System :: OS Independent [options] packages = find: install_requires = - setuptools >=39.2.0 - future >=0.14 - packaging >=15.0 - numpy >=1.13.3, !=1.14.0, !=1.14.1, !=1.14.2 - scipy >=0.14 -python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.* + setuptools >=65.6 + future >=0.16 + packaging >=17.0 + numpy >=1.19 + scipy >=1.1 +python_requires = >=3.7 tests_require = - pytest >=3.1, <5.0 ; python_version <= "2.7" pytest >=5.4.0 ; python_version >= "3" coverage >=4.0 coveralls