OpenPNM v2.5.0 #minor release

PMEAL · Aug 28, 2020 · f2702b4 · f2702b4
2 parents 260000d + c5c9e09
commit f2702b4
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
@@ -40,7 +40,7 @@ jobs:
         with:
           auto-update-conda: true
           python-version: ${{ matrix.python-version }}
-          condarc-file: tests/environment.yml
+          condarc-file: requirements/.condarc
           allow-softlinks: true
           channel-priority: flexible
           show-channel-urls: false

diff --git a/.github/workflows/ci-min.yml b/.github/workflows/ci-min.yml
@@ -40,7 +40,7 @@ jobs:
         with:
           auto-update-conda: true
           python-version: ${{ matrix.python-version }}
-          condarc-file: tests/environment.yml
+          condarc-file: requirements/.condarc
           allow-softlinks: true
           channel-priority: flexible
           show-channel-urls: false

diff --git a/.github/workflows/ci-ubuntu.yml b/.github/workflows/ci-ubuntu.yml
@@ -40,7 +40,7 @@ jobs:
         with:
           auto-update-conda: true
           python-version: ${{ matrix.python-version }}
-          condarc-file: tests/environment.yml
+          condarc-file: requirements/.condarc
           allow-softlinks: true
           channel-priority: flexible
           show-channel-urls: false

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
@@ -40,7 +40,7 @@ jobs:
         with:
           auto-update-conda: true
           python-version: ${{ matrix.python-version }}
-          condarc-file: tests/environment.yml
+          condarc-file: requirements/.condarc
           allow-softlinks: true
           channel-priority: flexible
           show-channel-urls: false

diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -39,7 +39,7 @@ jobs:
         with:
           auto-update-conda: true
           python-version: ${{ matrix.python-version }}
-          condarc-file: tests/environment.yml
+          condarc-file: requirements/.condarc
           allow-softlinks: true
           channel-priority: flexible
           show-channel-urls: false

diff --git a/requirements/.condarc b/requirements/.condarc
@@ -2,5 +2,8 @@ ssl_verify: true
 channels:
   - defaults
   - conda-forge
-channel_priority: true
+  - haasad
+channel_priority: flexible
+auto_update_conda: true
+pip_interop_enabled: true
 anaconda_upload: false
diff --git a/tests/environment.yml b/tests/environment.yml