Skip to content

Commit

Permalink
Merge pull request #1658 from leftaroundabout/release/conservative-0.8
Browse files Browse the repository at this point in the history
Meta-information for v0.8 (minor release, bringing legacy ODL up to date with modern NumPy/SciPy).
  • Loading branch information
leftaroundabout authored Sep 6, 2024
2 parents dd28ae9 + 788a1af commit 5e0c110
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 27 deletions.
33 changes: 18 additions & 15 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: odl
version: "1.0.0.dev"
version: "0.8.0"

source:
git_url: https://github.com/odlgroup/odl
Expand All @@ -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:
Expand All @@ -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)
22 changes: 10 additions & 12 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5e0c110

Please sign in to comment.