Skip to content

Commit 0869e59

Browse files
restructured requirments
1 parent c478e8a commit 0869e59

File tree

7 files changed

+29
-72
lines changed

7 files changed

+29
-72
lines changed

.github/workflows/tests_and_coverage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
path: ~/conda_pkgs_dir
2525
key:
2626
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{
27-
hashFiles('environment_dev.yml') }}
27+
hashFiles('environment.yml') }}
2828

2929
- name: Setup conda and environment
3030
uses: conda-incubator/setup-miniconda@v2
@@ -34,7 +34,7 @@ jobs:
3434
mamba-version: "*"
3535
channel-priority: true
3636
activate-environment: coco-dev
37-
environment-file: environment_dev.yml
37+
environment-file: environment.yml
3838
use-only-tar-bz2: true # required for caching
3939

4040
- name: List environment

doc/rtd-requirements.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
pandas >= 1.0
2-
numpy >= 1.20
3-
matplotlib >= 2.0.0
4-
requests >= 2.18
5-
xlrd > 1.1.0
6-
openpyxl >= 3.0.6
71
docutils < 0.18
82
sphinx >= 1.6.4
93
sphinx_rtd_theme >= 0.2.4

environment.yml

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,35 @@
1-
name: pymrio
1+
name: pymrio_dev
22
channels:
33
- defaults
44
- anaconda
55
- conda-forge
6-
- konstantinstadler
76
dependencies:
7+
# core
88
- pandas >= 1.0
99
- numpy >= 1.20
1010
- matplotlib >= 2.0.0
1111
- requests >= 2.18
1212
- xlrd > 1.1.0
1313
- openpyxl >= 3.0.6
1414
- docutils >= 0.14
15+
# testing and developing
16+
- pdbpp
17+
- country_converter >= 0.7.0
18+
- pytest=5.4.3
19+
- isort >= 5.6.0
20+
- pytest-black
21+
- pytest-cov
22+
- nbval
23+
- black >= 20.8b1
24+
- ipython
25+
- jupyterlab=3
26+
- jupytext
27+
- coveralls
28+
- pynvim
29+
- sphinx >= 1.6.4
30+
- sphinx_rtd_theme >= 0.2.4
31+
- ipykernel
32+
- nbsphinx
1533
- pip
1634
- pip:
17-
- pymrio
18-
35+
- pandasgui

environment_dev.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

requirements.txt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1 @@
1-
pandas >= 1.0
2-
numpy >= 1.20
3-
matplotlib >= 2.0.0
4-
requests >= 2.18
5-
xlrd > 1.1.0
6-
openpyxl >= 3.0.6
7-
docutils < 0.18
8-
1+
.

requirements_test.txt

Lines changed: 0 additions & 14 deletions
This file was deleted.

setup.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@
2121
},
2222
# This some needs to be here and in requirments.txt (for conda)
2323
install_requires=[
24-
"pandas >= 0.25.0",
24+
"pandas >= 1.0",
25+
"numpy >= 1.20",
2526
"matplotlib >= 2.0.0",
2627
"requests >= 2.18",
27-
"numpy >= 1.13.4",
28-
"xlrd >= 1.1.0",
28+
"xlrd > 1.1.0 ",
29+
"openpyxl >= 3.0.6",
30+
"docutils >= 0.14",
2931
],
3032
classifiers=[
3133
"Programming Language :: Python :: 3.7",

0 commit comments

Comments
 (0)