Merge branch 'main' into task/format-with-black

.github/workflows/release.yml

@@ -8,14 +8,28 @@ on:
 jobs:
   release:
     name: Deploy to PyPI
-    if: ${{ !github.event.release.prerelease && github.event.release.target_commitish == 'main' }}
+    if: ${{ github.event.release.target_commitish == 'main' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Set Release Version
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV
+
+      - name: Check Release Version Format
+        run: |
+          re=[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?
+          if ! [[ $RELEASE_VERSION =~ $re ]]; then
+            echo 'Tag does not match expected regex pattern for beta releases (v[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?)'
+            echo $RELEASE_VERSION
+            echo 'Please update your tag to match the expected regex pattern'
+            exit 1
+          fi
+
       - name: Deploy to PYPI
         uses: ./.github/actions/deploy
         env:
           PYPI_USERNAME: ${{ secrets.PYPI_USERNAME }}
           PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+          RELEASE_VERSION: ${{ env.RELEASE_VERSION }}

requirements.txt

@@ -1,5 +1,5 @@
 attrs==21.4.0
-certifi==2022.12.7
+certifi==2023.7.22
 charset-normalizer==2.1.0
 click==8.1.3
 commonmark==0.9.1
@@ -9,10 +9,10 @@ jsonpointer==2.3
 jsonschema==4.6.1
 openapi-schema-validator==0.2.3
 openapi-spec-validator==0.4.0
-pygments==2.12.0
+pygments==2.15.0
 pyrsistent==0.18.1
 pyyaml==6.0
-requests==2.28.1
+requests==2.31.0
 rich==12.4.4
 setuptools==65.5.1
-urllib3==1.26.9
+urllib3==1.26.18

setup.py

@@ -1,22 +1,26 @@
+import os
 from setuptools import setup, find_packages
 from pathlib import Path
 
+NAME = "pypony"
+VERSION = VERSION = os.environ['RELEASE_VERSION']
+
 this_directory = Path(__file__).parent
 long_description = (this_directory / "README.md").read_text()
 
 with open("requirements.txt", "r") as fp:
     requirements = fp.readlines()
 
 setup(
-    name="pypony",
-    description="A python utility for contract testing APIs",
+    name=NAME,
+    version=VERSION,
+    description='A python utility for contract testing APIs',
     long_description=long_description,
-    long_description_content_type="text/markdown",
-    author="Bandwidth",
-    author_email="letstalk@bandwidth.com",
-    url="https://github.com/Bandwidth/pypony/",
-    version="1.0.0b2",
-    py_modules=["pypony", "src"],
+    long_description_content_type='text/markdown',
+    author='Bandwidth',
+    author_email='letstalk@bandwidth.com',
+    url='https://github.com/Bandwidth/pypony/',
+    py_modules=['pypony', 'src'],
     install_requires=requirements,
     packages=find_packages(exclude=["test"]),
     include_package_data=True,