Merge pull request #38 from 3mcloud/feature/27104

27104 - Make release version into a usable env var in setup.py
3mcloud · Mar 5, 2021 · 5012139 · 5012139
2 parents d727814 + 0ed84ed
commit 5012139
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
@@ -2,7 +2,7 @@ name: Push to PyPi
 
 on:
   release:
-    types: [created]
+    types: [published]
 
 jobs:
   build:
@@ -22,6 +22,7 @@ jobs:
         env:
           TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+          RELEASE_VERSION: ${{ github.event.release.tag_name }}
         run: |
           python setup.py sdist bdist_wheel
           twine upload dist/*
diff --git a/setup.py b/setup.py
@@ -2,12 +2,11 @@
 '''
 Setup tools
 '''
-import re
-import subprocess
+import os
 from setuptools import setup, find_packages
 
 NAME = 'falcano'
-VERSION = '0.0.7'
+VERSION = os.getenv('RELEASE_VERSION', 'DEV')
 AUTHOR = 'Eric Walker'
 AUTHOR_EMAIL = 'ewalker3@mmm.com'
 DESCRIPTION = 'Falcano'