Skip to content

Commit 5e0c110

Browse files
Merge pull request #1658 from leftaroundabout/release/conservative-0.8
Meta-information for v0.8 (minor release, bringing legacy ODL up to date with modern NumPy/SciPy).
2 parents dd28ae9 + 788a1af commit 5e0c110

File tree

2 files changed

+28
-27
lines changed

2 files changed

+28
-27
lines changed

conda/meta.yaml

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package:
22
name: odl
3-
version: "1.0.0.dev"
3+
version: "0.8.0"
44

55
source:
66
git_url: https://github.com/odlgroup/odl
@@ -15,30 +15,30 @@ build:
1515

1616
requirements:
1717
build:
18-
- python
19-
- setuptools
18+
- python >=3.7
19+
- setuptools >=65.6
2020

2121
host:
2222
- python
2323
- setuptools
2424
- nomkl # [not win]
25-
- future >=0.14
26-
- numpy >=1.13.3
27-
- scipy >=0.14
28-
- packaging >=15.0
25+
- future >=0.16
26+
- numpy >=1.19
27+
- scipy >=1.1
28+
- packaging >=17.0
2929

3030
run:
3131
- python
32-
- future >=0.14
33-
- numpy >=1.13.3
34-
- scipy >=0.14
35-
- packaging >=15.0
36-
- matplotlib
32+
- future >=0.16
33+
- numpy >=1.19
34+
- scipy >=1.1
35+
- packaging >=17.0
36+
- matplotlib >=3.4
3737

3838
test:
3939
requires:
4040
- nomkl # [not win]
41-
- pytest >=3.0.3,<5.1
41+
- pytest >=5.4
4242
imports:
4343
- odl
4444
commands:
@@ -52,5 +52,8 @@ about:
5252

5353
extra:
5454
maintainers:
55-
- Jonas Adler (@adler-j)
56-
- Holger Kohr (@kohr-h)
55+
- Ozan Öktem (@ozanoktem)
56+
- Justus Sagemüller (@leftaroundabout)
57+
- Emilien Valat (@Emvlt)
58+
# - Jonas Adler (@adler-j)
59+
# - Holger Kohr (@kohr-h)

setup.cfg

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,24 @@ classifiers =
2727
Topic :: Software Development :: Libraries
2828
Topic :: Software Development :: Libraries :: Python Modules
2929
License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
30-
Programming Language :: Python :: 2
31-
Programming Language :: Python :: 2.7
32-
Programming Language :: Python :: 3
33-
Programming Language :: Python :: 3.5
34-
Programming Language :: Python :: 3.6
3530
Programming Language :: Python :: 3.7
3631
Programming Language :: Python :: 3.8
32+
Programming Language :: Python :: 3.9
33+
Programming Language :: Python :: 3.10
34+
Programming Language :: Python :: 3.11
35+
Programming Language :: Python :: 3.12
3736
Operating System :: OS Independent
3837

3938
[options]
4039
packages = find:
4140
install_requires =
42-
setuptools >=39.2.0
43-
future >=0.14
44-
packaging >=15.0
45-
numpy >=1.13.3, !=1.14.0, !=1.14.1, !=1.14.2
46-
scipy >=0.14
47-
python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
41+
setuptools >=65.6
42+
future >=0.16
43+
packaging >=17.0
44+
numpy >=1.19
45+
scipy >=1.1
46+
python_requires = >=3.7
4847
tests_require =
49-
pytest >=3.1, <5.0 ; python_version <= "2.7"
5048
pytest >=5.4.0 ; python_version >= "3"
5149
coverage >=4.0
5250
coveralls

0 commit comments

Comments
 (0)