v1.5.4

Author: nickmaccarthy

.github/workflows/release.yaml

@@ -4,7 +4,43 @@ on:
     types: 
       - released
 jobs:
-  release-python2:
+  # release-python2:
+  #   runs-on: ubuntu-20.04
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - name: install python2 for ubuntu
+  #       run: sudo apt install python2
+  #     - name: get pip script for python2
+  #       run: curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py
+  #     - name: install pip for python2
+  #       run: sudo python2 get-pip.py
+  #     - name: install requirements for python2
+  #       run: pip2 install -r requirements-2.txt
+  #     - name: package and upload python2
+  #       env:
+  #         TWINE_USERNAME: __token__
+  #         TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
+  #         PYTHON_DATEMATH_VERSION: ${{ github.event.release.tag_name }}
+  #       run: |
+  #         python2.7 setup.py sdist bdist_wheel
+  #         twine upload dist/*
+  # release-python3:
+  #   runs-on: ubuntu-20.04
+  #   needs: 
+  #     - release-python2
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - name: install requirements for python3
+  #       run: pip3 install -r requirements-3.txt
+  #     - name: package and upload python3
+  #       env:
+  #         TWINE_USERNAME: __token__
+  #         TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
+  #         PYTHON_DATEMATH_VERSION: ${{ github.event.release.tag_name }}
+  #       run: |
+  #         python3 setup.py sdist bdist_wheel
+  #         twine upload dist/*
+  release-to-pypi:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
@@ -16,20 +52,6 @@ jobs:
         run: sudo python2 get-pip.py
       - name: install requirements for python2
         run: pip2 install -r requirements-2.txt
-      - name: package and upload python2
-        env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
-          PYTHON_DATEMATH_VERSION: ${{ github.event.release.tag_name }}
-        run: |
-          python2.7 setup.py sdist bdist_wheel
-          twine upload dist/*
-  release-python3:
-    runs-on: ubuntu-20.04
-    needs: 
-      - release-python2
-    steps:
-      - uses: actions/checkout@v2
       - name: install requirements for python3
         run: pip3 install -r requirements-3.txt
       - name: package and upload python3
@@ -38,5 +60,6 @@ jobs:
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
           PYTHON_DATEMATH_VERSION: ${{ github.event.release.tag_name }}
         run: |
+          python2.7 setup.py sdist bdist_wheel
           python3 setup.py sdist bdist_wheel
           twine upload dist/*

CHANGELOG.md

@@ -1,4 +1,6 @@
 # Changelog
+## 1.5.4 (2021-04-20)
+* skipped due to name conflict on pypi, all changes in this are from `1.5.3`
 
 ## 1.5.3 (2021-04-16)
 * [FIX] [Issue #25](https://github.com/nickmaccarthy/python-datemath/issues/25) - Fixed an issue where if you provided an invalid timestamp, i.e. `datemath('2')` you would not get an DateMathException back.  Also bumped dependencies.

VERSION.txt

@@ -1 +1 @@
-1.5.3
+1.5.4