Skip to content

Commit 540d357

Browse files
committed
Sync requirements.txt with install_requires in setup.py
1 parent 036ffae commit 540d357

12 files changed

+15
-40
lines changed

.github/workflows/cleanup-tags.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Clean Up Tags
22

3-
on: push
3+
on: [workflow_dispatch]
44

55
jobs:
66
deploy:

.github/workflows/examples.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,15 @@ jobs:
2727
uses: actions/cache@v2
2828
with:
2929
path: ~/.cache/pip
30-
key: ${{ runner.os }}-pip-${{ hashFiles('**/pip_requirements.txt') }}
30+
key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
3131
restore-keys: |
3232
${{ runner.os }}-pip-
3333
3434
- name: Install dependencies (pip)
3535
run: |
3636
pip install \
37-
-r requirements/pip_requirements.txt \
38-
-r requirements/test_requirements.txt
39-
# Install openpnm from the checked-out branch
40-
pip install -e . --no-deps
37+
-r requirements/requirements.txt \
38+
-r requirements/tests.txt
4139
4240
- name: Running tests
4341
run:

.github/workflows/gh-pages.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ jobs:
3636

3737
- name: Install dependencies
3838
run: |
39-
mamba install --file requirements/doc_requirements.txt
40-
pip install -r requirements/pip_requirements.txt
41-
pip install -e . --no-deps
39+
mamba install --file requirements/docs.txt
40+
pip install -r requirements.txt
4241
4342
- name: Build the documentation
4443
run: |

.github/workflows/tests.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
uses: actions/cache@v2
3232
with:
3333
path: ${{ matrix.path }}
34-
key: ${{ runner.os }}-pip-${{ hashFiles('**/pip_requirements.txt') }}
34+
key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
3535
restore-keys: |
3636
${{ runner.os }}-pip-
3737
@@ -45,10 +45,8 @@ jobs:
4545
- name: Install dependencies (pip)
4646
run: |
4747
pip install \
48-
-r requirements/pip_requirements.txt \
49-
-r requirements/test_requirements.txt
50-
# Install openpnm from the checked-out branch
51-
pip install -e . --no-deps
48+
-r requirements.txt \
49+
-r requirements/tests.txt
5250
5351
- name: Running tests
5452
run:

.github/workflows/verify-pip-installation.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Verify pip-installability
22

3-
on: [pull_request]
3+
on: [workflow_dispatch]
44

55
jobs:
66
deploy:

requirements.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
--index-url https://pypi.python.org/simple/
2+
3+
-e .

requirements/conda_requirements.txt requirements/conda.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
chemicals
2-
docrep>=0.3
2+
docrep
33
flatdict
44
h5py
55
jsonschema
File renamed without changes.

requirements/optional_requirements.txt

-2
This file was deleted.

requirements/pip_requirements.txt

-20
This file was deleted.
File renamed without changes.

setup.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def get_version(rel_path):
5050
packages=find_packages("."),
5151
install_requires=[
5252
'chemicals',
53-
'docrep>=0.3',
53+
'docrep',
5454
'flatdict',
5555
'h5py',
5656
'jsonschema',
@@ -68,7 +68,6 @@ def get_version(rel_path):
6868
'tqdm',
6969
'traits',
7070
'transforms3d',
71-
'vispy'
7271
],
7372
author='OpenPNM Team',
7473
author_email='[email protected]',

0 commit comments

Comments
 (0)