Merge pull request #239 from DontShaveTheYak/develop

Release 0.6.2

Author: shadycuz

.devcontainer/Dockerfile

@@ -49,11 +49,12 @@ ENV PATH $PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH
 
 # Install the required python versions (this takes a bit usually) so we do lots of cacheing
 RUN --mount=type=cache,target=/home/vscode/.pyenv/cache,uid=1000 \
-    pyenv install -s 3.7.13 && \
-    pyenv install -s 3.8.13 && \
-    pyenv install -s 3.9.12 && \
-    pyenv install -s 3.10.4 && \
-    pyenv global 3.9.12 && \
+    pyenv install -s 3.8.18 && \
+    pyenv install -s 3.9.18 && \
+    pyenv install -s 3.10.13 && \
+    pyenv install -s 3.11.6 && \
+    pyenv install -s 3.12.0 && \
+    pyenv global 3.11.6 && \
     pyenv rehash
 
 # Install poetry to manage our python project

.github/workflows/release.yml

@@ -17,14 +17,14 @@ jobs:
     steps:
 
       - name: Checkout Code
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.1
         with:
           fetch-depth: 0
 
-      - name: Setup Python 3.9
-        uses: actions/[email protected].0
+      - name: Setup Python 3.11
+        uses: actions/[email protected].1
         with:
-          python-version: '3.9'
+          python-version: '3.11'
           architecture: x64
 
       - name: Install dependencies
@@ -72,12 +72,12 @@ jobs:
     needs: tag
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.1
 
-      - name: Setup Python 3.9
-        uses: actions/[email protected].0
+      - name: Setup Python 3.11
+        uses: actions/[email protected].1
         with:
-          python-version: '3.9'
+          python-version: '3.11'
           architecture: x64
 
       - name: Setup Poetry
@@ -104,7 +104,7 @@ jobs:
     needs: [tag, publish]
     steps:
       - name: Create Draft Release
-        uses: release-drafter/release-drafter@v5.24.0
+        uses: release-drafter/release-drafter@v5.25.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.24.0
+        uses: release-drafter/release-drafter@v5.25.0
         if: github.base_ref == 'master'
         with:
           tag: ${{needs.tag.outputs.tag}}

.github/workflows/test.yml

@@ -12,15 +12,15 @@ on:
 jobs:
   single:
     runs-on: ubuntu-latest
-    name: Python 3.9
+    name: Python 3.11
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.1
 
       - name: Setup Latest Python
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
-          python-version: 3.9
+          python-version: 3.11
           architecture: x64
 
       - name: Setup Poetry
@@ -32,10 +32,10 @@ jobs:
         run: pip install nox nox_poetry coverage[toml]
 
       - name: Run Tests
-        run: nox -s tests -p 3.9
+        run: nox -s tests -p 3.11
 
       - name: Combine Coverage reports
-        run: nox -s coverage -p 3.9
+        run: nox -s coverage -p 3.11
 
       - name: Convert Coverage
         run: coverage xml --fail-under=0
@@ -52,14 +52,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.10"] # 3.9 is done in the job above
+        python-version: ["3.8", "3.9", "3.10", "3.12"] # 3.11 is done in the job above
     name: Python ${{ matrix.python-version }}
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.1
 
       - name: Setup Python ${{ matrix.python-version }}
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
           python-version: ${{ matrix.python-version }}
           architecture: x64

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
       language: python
       language_version: python3
       types: ["python"]
-      args: ["-rs", "black", "-p", "3.9"]
+      args: ["-rs", "black", "-p", "3.11"]
       require_serial: true
       additional_dependencies: []
     - id: lint
@@ -18,7 +18,7 @@ repos:
       language: python
       language_version: python3
       types: ["python"]
-      args: ["-rs", "lint", "-p", "3.9"]
+      args: ["-rs", "lint", "-p", "3.11"]
       require_serial: true
       additional_dependencies: []
     - id: mypy
@@ -27,7 +27,7 @@ repos:
       language: python
       language_version: python3
       types: ["python"]
-      args: ["-rs", "mypy", "-p", "3.9"]
+      args: ["-rs", "mypy", "-p", "3.11"]
       require_serial: true
       additional_dependencies: []
     - id: tests
@@ -36,6 +36,6 @@ repos:
       language: python
       language_version: python3
       types: ["python"]
-      args: ["-rs", "tests", "-p", "3.9"]
+      args: ["-rs", "tests", "-p", "3.11"]
       require_serial: true
       additional_dependencies: []

.python-version

@@ -1,4 +1,5 @@
-3.9.12
-3.7.13
-3.8.13
-3.10.4
+3.11.6
+3.12.0
+3.10.13
+3.9.18
+3.8.18

.scripts/requirements.txt

@@ -1,2 +1,2 @@
 requests==2.31.0
-semver==3.0.1
+semver==3.0.2

.vscode/launch.json

@@ -5,17 +5,17 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "Python: Current File",
+      "name": "cf2tf: Test Template",
       "type": "python",
       "request": "launch",
       "program": "${workspaceFolder}/src/cf2tf/app.py",
       "console": "integratedTerminal",
       "args": [
         "-v",
         "debug",
-        "tests/data/log_bucket.yaml"
+        "tests/data/templates/log_bucket.yaml"
       ],
       "justMyCode": true
     }
   ]
-}
+}

README.md

@@ -76,7 +76,7 @@
 
 ### Prerequisites
 
-Cloudformation 2 Terraform requires python >= 3.7
+Cloudformation 2 Terraform requires python >= 3.8
 
 ### Installation
 
@@ -85,6 +85,12 @@ cf2tf is available as an easy to install pip package.
 pip install cf2tf
 ```
 
+If you are a [Homebrew](https://brew.sh/) user, can you install via brew:
+
+```
+$ brew install cf2tf
+```
+
 ## Usage
 
 To convert a template to terraform.
@@ -119,13 +125,13 @@ Contributions are what make the open-source community such an amazing place to l
 
 
 
-This project uses poetry to manage dependencies and pre-commit to run formatting, linting and tests. You will need to have both installed to your system as well as python 3.9.
+This project uses poetry to manage dependencies and pre-commit to run formatting, linting and tests. You will need to have both installed to your system as well as python 3.11.
 
 1. Fork the Project
-2. Setup the environment.  
+2. Setup the environment.
    This project uses vscode devcontainer to provide a completly configured development environment. If you are using vscode and have the remote container extension installed, you should be asked to use the devcontainer when you open this project inside of vscode.
 
-   If you are not using devcontainers then you will need to have python installed. Install the `poetry`, `nox`, `nox_poetry` and `pre-commit` packages. Then run `poetry install` and `pre-commit install` commands. 
+   If you are not using devcontainers then you will need to have python installed. Install the `poetry`, `nox`, `nox_poetry` and `pre-commit` packages. Then run `poetry install` and `pre-commit install` commands.
 
    Most of the steps can be found in the [Dockerfile](.devcontainer/Dockerfile).
 2. Create your Feature Branch (`git checkout -b feature/AmazingFeature`)

noxfile.py

@@ -17,7 +17,7 @@
     raise SystemExit(dedent(message)) from None
 
 
-python_versions = ["3.10", "3.9", "3.8", "3.7"]
+python_versions = ["3.12", "3.11", "3.10", "3.9", "3.8"]
 
 nox.options.sessions = (
     # "pre-commit",