Merge pull request #133 from DontShaveTheYak/develop

Release 0.5.0

.github/workflows/release.yml

@@ -17,12 +17,12 @@ jobs:
     steps:
 
       - name: Checkout Code
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v3.4.0
         with:
           fetch-depth: 0
 
       - name: Setup Python 3.9
-        uses: actions/setup-python@v4.3.0
+        uses: actions/setup-python@v4.5.0
         with:
           python-version: '3.9'
           architecture: x64
@@ -31,7 +31,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -r .scripts/requirements.txt
-          pip install poetry==1.1.14
+          pip install poetry==1.4.0
 
       - name: Get Latest Tag
         id: latest_tag
@@ -72,16 +72,16 @@ jobs:
     needs: tag
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v3.4.0
 
       - name: Setup Python 3.9
-        uses: actions/setup-python@v4.3.0
+        uses: actions/setup-python@v4.5.0
         with:
           python-version: '3.9'
           architecture: x64
 
       - name: Setup Poetry
-        run: pip install poetry==1.1.14
+        run: pip install poetry==1.4.0
 
       - name: Publish to Test PyPI
         if: github.base_ref == 'develop'
@@ -104,7 +104,7 @@ jobs:
     needs: [tag, publish]
     steps:
       - name: Create Draft Release
-        uses: release-drafter/release-drafter@v5.21.1
+        uses: release-drafter/release-drafter@v5.23.0
         if: github.base_ref == 'develop'
         with:
           tag: ${{needs.tag.outputs.tag}}
@@ -114,7 +114,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create Release
-        uses: release-drafter/release-drafter@v5.21.1
+        uses: release-drafter/release-drafter@v5.23.0
         if: github.base_ref == 'master'
         with:
           tag: ${{needs.tag.outputs.tag}}

.github/workflows/test.yml

@@ -3,29 +3,29 @@ name: Tests
 on:
   push:
     branches:
-      - 'master'
+      - "master"
   pull_request:
     paths-ignore:
-      - '.github/workflows/release.yml'
-      - '.github/workflows/pr_checks.yml'
+      - ".github/workflows/release.yml"
+      - ".github/workflows/pr_checks.yml"
 
 jobs:
   single:
     runs-on: ubuntu-latest
     name: Python 3.9
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v3.4.0
 
       - name: Setup Latest Python
-        uses: actions/setup-python@v4.3.0
+        uses: actions/setup-python@v4.5.0
         with:
           python-version: 3.9
           architecture: x64
 
       - name: Setup Poetry
         run: |
-          pip install poetry==1.1.14
+          pip install poetry==1.4.0
           poetry install
 
       - name: Setup requirements
@@ -43,6 +43,7 @@ jobs:
       - name: Upload coverage to Codecov
         uses: codecov/[email protected]
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           flags: unit
           fail_ci_if_error: true
 
@@ -51,14 +52,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.10'] # 3.9 is done in the job above
+        python-version: ["3.7", "3.8", "3.10"] # 3.9 is done in the job above
     name: Python ${{ matrix.python-version }}
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v3.4.0
 
       - name: Setup Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4.3.0
+        uses: actions/setup-python@v4.5.0
         with:
           python-version: ${{ matrix.python-version }}
           architecture: x64
@@ -67,7 +68,7 @@ jobs:
         run: pip install nox nox_poetry
 
       - name: Setup Poetry
-        run: pip install poetry==1.1.14
+        run: pip install poetry==1.4.0
 
       - name: Run Tests
         run: nox -s tests -p ${{ matrix.python-version }}

.scripts/bump.py

@@ -69,13 +69,13 @@ def prerelease(rule: str) -> str:
 
 if branch == "master":
     print("This release is a final release!")
-    base_tag = latest_tag.split("-")[0]
+    base_tag = latest_tag.split("a")[0]
     bump_rule = "None"
 
-elif "-alpha" in latest_tag:
+elif "a" in latest_tag:
     print("This is an existing prerelease.")
 
-    latest_ver = latest_tag.split("-")[0]
+    latest_ver = latest_tag.split("a")[0]
 
     next_tag = semver.VersionInfo.parse(release_tag)
 
@@ -117,4 +117,4 @@ def prerelease(rule: str) -> str:
 
 set_output("base_tag", base_tag)
 set_output("bump_rule", bump_rule)
-sys.exit(0)
+sys.exit(0)

.scripts/requirements.txt

@@ -1,2 +1,2 @@
-requests==2.28.1
+requests==2.28.2
 semver==2.13.0

README.md

@@ -152,7 +152,7 @@ Levi - [@shady_cuz](https://twitter.com/shady_cuz)
 [python-shield]: https://img.shields.io/pypi/pyversions/cf2tf?style=for-the-badge
 [version-shield]: https://img.shields.io/pypi/v/cf2tf?label=latest&style=for-the-badge
 [pypi-url]: https://pypi.org/project/cf2tf/
-[test-shield]: https://img.shields.io/github/workflow/status/DontShaveTheYak/cf2tf/Tests?label=Tests&style=for-the-badge
+[test-shield]: https://img.shields.io/github/actions/workflow/status/DontShaveTheYak/cf2tf/test.yml?label=Tests&style=for-the-badge
 [test-url]: https://github.com/DontShaveTheYak/cf2tf/actions?query=workflow%3ATests+branch%3Amaster
 [codecov-shield]: https://img.shields.io/codecov/c/gh/DontShaveTheYak/cf2tf/master?color=green&style=for-the-badge&token=bfF18q99Fl
 [codecov-url]: https://codecov.io/gh/DontShaveTheYak/cf2tf