OpenPNM v2.7.0 #minor

.github/workflows/bump-version.yml

@@ -85,16 +85,6 @@ jobs:
         pr_allow_empty: true                              # Creates pull request even if there are no changes
         github_token: ${{ secrets.GITHUB_TOKEN }}
 
-    # - name: Create Pull Request to merge back release into dev
-    #   uses: peter-evans/create-pull-request@v3
-    #   with:
-    #     token: ${{ secrets.PUSH_ACTION_TOKEN }}
-    #     branch: release
-    #     base: dev
-    #     title: Don't forget to merge release back into dev!
-    #     body: Changes made to the release branch (e.g. hotfixes), plus the version bump.
-    #     delete-branch: false
-
     - name: Create new tag
       run: |
         REPOSITORY=${INPUT_REPOSITORY:-$GITHUB_REPOSITORY}

.github/workflows/publish-to-pypi.yml

@@ -47,21 +47,21 @@ jobs:
     - name: Build distribution 📦
       run: python setup.py sdist bdist_wheel
 
-    # - name: Publish distribution 📦 to PyPI
-    #   if: startsWith(github.event.ref, 'refs/tags') && contains(env.TAG_MISMATCH, 'false')
-    #   uses: pypa/gh-action-pypi-publish@master
-    #   with:
-    #     user: __token__
-    #     password: ${{ secrets.PYPI_TOKEN }}
-    #     skip_existing: true
-
-    - name: Publish distribution 📦 to TestPyPI
+    - name: Publish distribution 📦 to PyPI
       if: startsWith(github.event.ref, 'refs/tags') && contains(env.TAG_MISMATCH, 'false')
       uses: pypa/gh-action-pypi-publish@master
       with:
         user: __token__
-        password: ${{ secrets.TESTPYPI_TOKEN }}
-        repository_url: https://test.pypi.org/legacy/
+        password: ${{ secrets.PYPI_TOKEN }}
+        skip_existing: true
+
+    # - name: Publish distribution 📦 to TestPyPI
+    #   if: startsWith(github.event.ref, 'refs/tags') && contains(env.TAG_MISMATCH, 'false')
+    #   uses: pypa/gh-action-pypi-publish@master
+    #   with:
+    #     user: __token__
+    #     password: ${{ secrets.TESTPYPI_TOKEN }}
+    #     repository_url: https://test.pypi.org/legacy/
 
     # Not a good idea: if a non-conforming tag is push, e.g. random_tag, it
     # first gets deleted by cleanup-tags.yml, and then publish-to-pypi.yml gets

openpnm/__version__.py

@@ -1 +1 @@
-__version__ = '2.7.0'
+__version__ = '2.6.1'

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.7.0
+current_version = 2.6.1
 
 [flake8]
 ignore = E122,E127,E203,E222,E226,E225,E241,E402,W503,F401