Skip to content

Commit 597782b

Browse files
Sayam753OriolAbril
andauthored
Fix dependencies in requirements-dev.txt (#5070)
* Fix dependencies in requirements-dev.txt * Fix dependencies in conda files * Fix pre-commit one more time * update and reduce environment files * unpin pandas Co-authored-by: Oriol (ZBook) <[email protected]>
1 parent 65abc6f commit 597782b

10 files changed

+19
-56
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ repos:
5252
- id: pip-from-conda
5353
additional_dependencies: [pyyaml]
5454
entry: python scripts/generate_pip_deps_from_conda.py
55-
files: ^conda-envs/
55+
files: ^conda-envs/environment-dev-py.+.yml$
5656
language: python
5757
name: Generate pip dependency from conda
5858
- id: no-relative-imports

conda-envs/environment-dev-py37.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# "dev" conda envs are to be used by devs in setting their local environments
12
name: pymc-dev-py37
23
channels:
34
- conda-forge
@@ -8,7 +9,7 @@ dependencies:
89
- cachetools>=4.2.1
910
- cloudpickle
1011
- fastprogress>=0.2.0
11-
- h5py
12+
- h5py>=2.7
1213
- ipython
1314
- myst-nb
1415
- numpy>=1.15
@@ -20,13 +21,11 @@ dependencies:
2021
- pytest>=3.0
2122
- python-graphviz
2223
- python=3.7
23-
- recommonmark>=0.4
2424
- scipy>1.4.1
2525
- sphinx-autobuild>=0.7
2626
- sphinx-notfound-page
2727
- sphinx-panels
2828
- sphinx>=1.5
2929
- typing-extensions
30-
- watermark
3130
- pip:
3231
- sphinx-design

conda-envs/environment-dev-py38.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# "dev" conda envs are to be used by devs in setting their local environments
12
name: pymc-dev-py38
23
channels:
34
- conda-forge
@@ -8,7 +9,7 @@ dependencies:
89
- cachetools>=4.2.1
910
- cloudpickle
1011
- fastprogress>=0.2.0
11-
- h5py
12+
- h5py>=2.7
1213
- ipython
1314
- myst-nb
1415
- numpy>=1.15.0
@@ -20,13 +21,11 @@ dependencies:
2021
- pytest>=3.0
2122
- python-graphviz
2223
- python=3.8
23-
- recommonmark>=0.4
2424
- scipy>1.4.1
2525
- sphinx-autobuild>=0.7
2626
- sphinx-notfound-page
2727
- sphinx-panels
2828
- sphinx>=1.5
2929
- typing-extensions>=3.7.4
30-
- watermark
3130
- pip:
3231
- sphinx-design

conda-envs/environment-dev-py39.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# "dev" conda envs are to be used by devs in setting their local environments
12
name: pymc-dev-py39
23
channels:
34
- conda-forge
@@ -20,13 +21,11 @@ dependencies:
2021
- pytest>=3.0
2122
- python-graphviz
2223
- python=3.9
23-
- recommonmark>=0.4
2424
- scipy>1.4.1
2525
- sphinx-autobuild>=0.7
2626
- sphinx-notfound-page
2727
- sphinx-panels
2828
- sphinx>=1.5
2929
- typing-extensions>=3.7.4
30-
- watermark
3130
- pip:
3231
- sphinx-design

conda-envs/environment-test-py37.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,24 @@
1+
# "test" conda envs are used to set up our CI environment in GitHub actions
12
name: pymc-test-py37
23
channels:
34
- conda-forge
45
- defaults
56
dependencies:
67
- aesara>=2.1.0
7-
- arviz>=0.11.2
8+
- arviz>=0.11.4
89
- cachetools>=4.2.1
910
- cloudpickle
1011
- fastprogress>=0.2.0
1112
- h5py>=2.7
1213
- ipython
1314
- libblas=*=*mkl
1415
- mkl-service
15-
- myst-nb
1616
- numpy>=1.15.0
17-
- numpydoc>=0.9
18-
- pandas=0.24
17+
- pandas>=0.24
1918
- pre-commit>=2.8.0
20-
- pydata-sphinx-theme
2119
- pytest-cov>=2.5
2220
- pytest>=3.0
2321
- python-graphviz
2422
- python=3.7
25-
- recommonmark>=0.4
2623
- scipy>1.4.1
27-
- sphinx-autobuild>=0.7
28-
- sphinx-panels
29-
- sphinx>=1.5
3024
- typing-extensions
31-
- watermark

conda-envs/environment-test-py38.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,24 @@
1+
# "test" conda envs are used to set up our CI environment in GitHub actions
12
name: pymc-test-py38
23
channels:
34
- conda-forge
45
- defaults
56
dependencies:
67
- aesara>=2.1.0
7-
- arviz>=0.11.2
8+
- arviz>=0.11.4
89
- cachetools>=4.2.1
910
- cloudpickle
1011
- fastprogress>=0.2.0
1112
- h5py>=2.7
1213
- ipython
1314
- libblas=*=*mkl
1415
- mkl-service
15-
- myst-nb
16-
- nbsphinx>=0.4
1716
- numpy>=1.15.0
18-
- numpydoc>=0.9
1917
- pandas
2018
- pre-commit>=2.8.0
21-
- pydata-sphinx-theme
2219
- pytest-cov>=2.5
2320
- pytest>=3.0
2421
- python-graphviz
2522
- python=3.8
26-
- recommonmark>=0.4
2723
- scipy>1.4.1
28-
- sphinx-autobuild>=0.7
29-
- sphinx-panels
30-
- sphinx>=1.5
3124
- typing-extensions>=3.7.4
32-
- watermark

conda-envs/environment-test-py39.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,24 @@
1+
# "test" conda envs are used to set up our CI environment in GitHub actions
12
name: pymc-test-py39
23
channels:
34
- conda-forge
45
- defaults
56
dependencies:
67
- aesara>=2.1.0
7-
- arviz>=0.11.2
8+
- arviz>=0.11.4
89
- cachetools
910
- cloudpickle
1011
- fastprogress>=0.2.0
1112
- h5py
1213
- ipython>=7.16
1314
- libblas=*=*mkl
1415
- mkl-service
15-
- myst-nb
16-
- nbsphinx>=0.4
1716
- numpy>=1.15.0
18-
- numpydoc>=0.9
1917
- pandas
2018
- pre-commit>=2.8.0
21-
- pydata-sphinx-theme
2219
- pytest-cov>=2.5
2320
- pytest>=3.0
2421
- python-graphviz
2522
- python=3.9
26-
- recommonmark>=0.4
2723
- scipy>1.4.1
28-
- sphinx-autobuild>=0.7
29-
- sphinx-panels
30-
- sphinx>=1.5
3124
- typing-extensions>=3.7.4
32-
- watermark

conda-envs/windows-environment-dev-py38.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ dependencies:
2525
- pydata-sphinx-theme
2626
- pytest-cov>=2.5
2727
- pytest>=3.0
28-
- recommonmark>=0.4
2928
- sphinx-autobuild>=0.7
3029
- sphinx-notfound-page
3130
- sphinx-panels

conda-envs/windows-environment-test-py38.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,8 @@ dependencies:
2020
- python-graphviz
2121
- scipy>1.4.1
2222
- typing-extensions>=3.7.4
23-
# Extra stuff for dev, testing and docs build
23+
# Extra stuff for testing
2424
- ipython>=7.16
25-
- myst-nb
26-
- nbsphinx>=0.4
27-
- numpydoc>=0.9
2825
- pre-commit>=2.8.0
29-
- pydata-sphinx-theme
3026
- pytest-cov>=2.5
3127
- pytest>=3.0
32-
- recommonmark>=0.4
33-
- sphinx-autobuild>=0.7
34-
- sphinx-panels
35-
- sphinx>=1.5
36-
- watermark

requirements-dev.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,24 @@
22
# See that file for comments about the need/usage of each dependency.
33

44
aesara>=2.1.0
5-
arviz>=0.11.2
6-
cachetools
5+
arviz>=0.11.4
6+
cachetools>=4.2.1
77
cloudpickle
88
fastprogress>=0.2.0
99
h5py>=2.7
10-
ipython>=7.16
10+
ipython
1111
myst-nb
12-
nbsphinx>=0.4
1312
numpy>=1.15.0
1413
numpydoc>=0.9
1514
pandas
1615
pre-commit>=2.8.0
1716
pydata-sphinx-theme
1817
pytest-cov>=2.5
1918
pytest>=3.0
20-
recommonmark>=0.4
2119
scipy>1.4.1
2220
sphinx-autobuild>=0.7
21+
sphinx-design
22+
sphinx-notfound-page
2323
sphinx-panels
2424
sphinx>=1.5
2525
typing-extensions>=3.7.4
26-
watermark

0 commit comments

Comments
 (0)