From 3ded249fb2b6a7de5efb7e922416c915c033b200 Mon Sep 17 00:00:00 2001
From: Amin Sadeghi <amin.sadeghi@live.com>
Date: Mon, 22 Feb 2021 18:33:15 -0500
Subject: [PATCH 1/2] Enabled publish-to-pypi, disabled test run

---
 .github/workflows/bump-version.yml    | 10 ----------
 .github/workflows/publish-to-pypi.yml | 22 +++++++++++-----------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml
index 4b764ba9cb..a3855a27df 100644
--- a/.github/workflows/bump-version.yml
+++ b/.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}
diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml
index a2fe1f3ef9..ae752881a6 100644
--- a/.github/workflows/publish-to-pypi.yml
+++ b/.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

From 37f2345bf16817e8e95e28e5fa9f87390e5745f5 Mon Sep 17 00:00:00 2001
From: Amin Sadeghi <amin.sadeghi@live.com>
Date: Mon, 22 Feb 2021 18:33:38 -0500
Subject: [PATCH 2/2] Reverted version to 2.6.1 to prepare for the actual
 release of 2.7.0

---
 openpnm/__version__.py | 2 +-
 setup.cfg              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openpnm/__version__.py b/openpnm/__version__.py
index 766ce2d066..574f4077e0 100644
--- a/openpnm/__version__.py
+++ b/openpnm/__version__.py
@@ -1 +1 @@
-__version__ = '2.7.0'
+__version__ = '2.6.1'
diff --git a/setup.cfg b/setup.cfg
index 446502957d..ec34b21d8b 100644
--- a/setup.cfg
+++ b/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