Sync requirements.txt with install_requires in setup.py

PMEAL · Aug 22, 2022 · 540d357 · 540d357
1 parent 036ffae
commit 540d357
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 40 deletions.
diff --git a/.github/workflows/cleanup-tags.yml b/.github/workflows/cleanup-tags.yml
@@ -1,6 +1,6 @@
 name: Clean Up Tags
 
-on: push
+on: [workflow_dispatch]
 
 jobs:
   deploy:

diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -27,17 +27,15 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/pip_requirements.txt') }}
+          key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
           restore-keys: |
             ${{ runner.os }}-pip-
 
       - name: Install dependencies (pip)
         run: |
           pip install \
-            -r requirements/pip_requirements.txt \
-            -r requirements/test_requirements.txt
-          # Install openpnm from the checked-out branch
-          pip install -e . --no-deps
+            -r requirements/requirements.txt \
+            -r requirements/tests.txt
 
       - name: Running tests
         run:

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -36,9 +36,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          mamba install --file requirements/doc_requirements.txt
-          pip install -r requirements/pip_requirements.txt
-          pip install -e . --no-deps
+          mamba install --file requirements/docs.txt
+          pip install -r requirements.txt
 
       - name: Build the documentation
         run: |

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -31,7 +31,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ matrix.path }}
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/pip_requirements.txt') }}
+          key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
           restore-keys: |
             ${{ runner.os }}-pip-
 
@@ -45,10 +45,8 @@ jobs:
       - name: Install dependencies (pip)
         run: |
           pip install \
-            -r requirements/pip_requirements.txt \
-            -r requirements/test_requirements.txt
-          # Install openpnm from the checked-out branch
-          pip install -e . --no-deps
+            -r requirements.txt \
+            -r requirements/tests.txt
 
       - name: Running tests
         run:

diff --git a/.github/workflows/verify-pip-installation.yml b/.github/workflows/verify-pip-installation.yml
@@ -1,6 +1,6 @@
 name: Verify pip-installability
 
-on: [pull_request]
+on: [workflow_dispatch]
 
 jobs:
   deploy:

diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,3 @@
+--index-url https://pypi.python.org/simple/
+
+-e .
diff --git a/requirements/conda_requirements.txt → requirements/conda.txt b/requirements/conda_requirements.txt → requirements/conda.txt
@@ -1,5 +1,5 @@
 chemicals
-docrep>=0.3
+docrep
 flatdict
 h5py
 jsonschema

diff --git a/requirements/doc_requirements.txt → requirements/docs.txt b/requirements/doc_requirements.txt → requirements/docs.txt
diff --git a/requirements/optional_requirements.txt b/requirements/optional_requirements.txt
diff --git a/requirements/pip_requirements.txt b/requirements/pip_requirements.txt
diff --git a/requirements/test_requirements.txt → requirements/tests.txt b/requirements/test_requirements.txt → requirements/tests.txt
diff --git a/setup.py b/setup.py
@@ -50,7 +50,7 @@ def get_version(rel_path):
     packages=find_packages("."),
     install_requires=[
         'chemicals',
-        'docrep>=0.3',
+        'docrep',
         'flatdict',
         'h5py',
         'jsonschema',
@@ -68,7 +68,6 @@ def get_version(rel_path):
         'tqdm',
         'traits',
         'transforms3d',
-        'vispy'
     ],
     author='OpenPNM Team',
     author_email='jgostick@uwaterloo.ca',