Merge branch 'release/2.0.0'

Author: rajadain

.github/workflows/ci.yml

@@ -0,0 +1,69 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - "**"
+  pull_request:
+
+jobs:
+  lint:
+    name: Lint (Python 3.12)
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+          cache: pip
+          cache-dependency-path: |
+            setup.py
+            setup.cfg
+
+      - name: Install linters
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install black flake8
+
+      - name: Lint (flake8)
+        run: flake8 .
+
+      - name: Format check (black)
+        run: black --check .
+
+  test:
+    name: Test (Python ${{ matrix.python-version }})
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version:
+          - "3.9"
+          - "3.10"
+          - "3.11"
+          - "3.12"
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: pip
+          cache-dependency-path: |
+            setup.py
+            setup.cfg
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install -e '.[test]'
+
+      - name: Run tests
+        run: python -m unittest

.github/workflows/release.yml

@@ -0,0 +1,38 @@
+name: Release to PyPI
+
+on:
+  push:
+    tags:
+      - "*"
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  id-token: write
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+          cache: pip
+          cache-dependency-path: |
+            setup.py
+            setup.cfg
+
+      - name: Build distributions
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install build
+          python -m build --sdist --wheel
+
+      - name: Publish to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1

.travis.yml

@@ -1,3 +1,10 @@
+## 2.0.0
+
+- Upgrade to boto3
+- Switch to GitHub Actions
+- Remove TravisCI
+- Test upto Python 3.12
+
 ## 1.0.0
 
 - Added Python 3 support (only Python 3.7 tested).

CHANGELOG.md

@@ -1,14 +1,32 @@
-# majorkirby [![Build Status](https://travis-ci.org/azavea/majorkirby.svg)](https://travis-ci.org/azavea/majorkirby)
+# majorkirby [![CI](https://github.com/azavea/majorkirby/actions/workflows/ci.yml/badge.svg)](https://github.com/azavea/majorkirby/actions/workflows/ci.yml)
 
 Puts CloudFormation stacks into motion.
 
+This project uses `boto3` for AWS CloudFormation.
+
 ## Testing
 
 There are two ways to run the built-in test suite. One is intended to be run locally, while the other is setup to run within a Docker container.
 
 ### Local
 
-The local tests require a working installation of Python 3:
+The local tests require a working installation of Python 3.
+
+Install dependencies (including test extras) and run the tests:
+
+```bash
+$ python3 -m pip install -e '.[test]'
+$ python3 -m unittest
+```
+
+If you prefer `uv`:
+
+```bash
+$ uv pip install -e '.[test]'
+$ uv run python -m unittest
+```
+
+The legacy setuptools test runner is still supported:
 
 ```bash
 $ python3 setup.py test
@@ -20,5 +38,12 @@ The Docker setup builds an image with Python 3 installed, along with all of this
 
 ```bash
 $ docker-compose build majorkirby
+$ docker-compose run majorkirby python -m pip install -e '.[test]'
+$ docker-compose run majorkirby python -m unittest
+```
+
+If you prefer to keep using the legacy setuptools test runner:
+
+```bash
 $ docker-compose run majorkirby python setup.py test
 ```

README.md

@@ -9,8 +9,8 @@
 import json
 import logging
 
-from boto import cloudformation
-from boto.exception import BotoServerError
+import boto3
+from botocore.exceptions import ClientError
 
 from troposphere import Template, Ref, Output, Tags
 
@@ -114,14 +114,49 @@ def __init__(self, **kwargs):
         self.should_run = False
         self.input_wiring = {}
         self.last_heartbeat_id = None
-        self.boto_conn = None
+        self._cfn_client = None
         self.stack_outputs = {}
         self.extra_outputs = {}
         self.stack_name = self.get_stack_name()
         self.aws_region = kwargs.get("aws_region", "us-east-1")
         self.aws_profile = kwargs.get("aws_profile", None)
         self.stack = None
 
+    def _get_cfn_client(self):
+        if self._cfn_client is not None:
+            return self._cfn_client
+
+        session = boto3.session.Session(
+            profile_name=self.aws_profile, region_name=self.aws_region
+        )
+        self._cfn_client = session.client("cloudformation")
+        return self._cfn_client
+
+    @staticmethod
+    def _to_cfn_parameters(parameters):
+        return [
+            {"ParameterKey": key, "ParameterValue": str(value)}
+            for key, value in parameters
+        ]
+
+    @staticmethod
+    def _to_cfn_tags(tags):
+        return [{"Key": key, "Value": str(value)} for key, value in tags.items()]
+
+    def _describe_stack(self):
+        cfn = self._get_cfn_client()
+        try:
+            response = cfn.describe_stacks(StackName=self.stack_name)
+            return response["Stacks"][0]
+        except ClientError as e:
+            error = e.response.get("Error", {})
+            if error.get("Code") != "ValidationError":
+                raise
+            message = (error.get("Message") or "").lower()
+            if "does not exist" not in message:
+                raise
+            return None
+
     def connect_from(self, stack, name=None):
         """
         Connects a node's outputs to this node's inputs.
@@ -227,7 +262,10 @@ def set_up_stack(self):
         """
         This method should be overridden to set up the stack.
         """
-        self.add_version("2010-09-09")
+        if hasattr(self, "set_version"):
+            self.set_version("2010-09-09")
+        else:
+            self.add_version("2010-09-09")
 
     def add_parameter(self, parameter, source=None):
         """
@@ -316,25 +354,25 @@ def _launch_cfn(self):
         Sets up stack and launches it.
         """
         self.set_up_stack()
-        self.boto_conn = cloudformation.connect_to_region(
-            region_name=self.aws_region, profile_name=self.aws_profile
-        )
+        cfn = self._get_cfn_client()
         parameters = []
         for param, input_name in list(self.input_wiring.items()):
             try:
                 parameters.append((param, self.get_input(input_name)))
             except MKInputError:
                 pass
-        # check to see if stack exists
-        try:
-            self.stack = self.boto_conn.describe_stacks(self.stack_name)[0]
-        except BotoServerError:
-            # it would be great if we could more granularly check the error
-            self.boto_conn.create_stack(
-                self.stack_name,
-                tags=self.get_raw_tags(),
-                template_body=self.to_json(),
-                parameters=parameters,
+
+        cfn_parameters = self._to_cfn_parameters(parameters)
+        cfn_tags = self._to_cfn_tags(self.get_raw_tags())
+
+        # Check to see if stack exists.
+        self.stack = self._describe_stack()
+        if self.stack is None:
+            cfn.create_stack(
+                StackName=self.stack_name,
+                Tags=cfn_tags,
+                TemplateBody=self.to_json(),
+                Parameters=cfn_parameters,
             )
             self.logger.info("Stack %s created", self.stack_name)
 
@@ -343,17 +381,20 @@ def _check_cfn(self):
         Checks the status of the stack
         """
 
-        self.stack = self.boto_conn.describe_stacks(self.stack_name)[0]
-        self.logger.debug("%s %s", self.stack_name, self.stack.stack_status)
-        return self.stack.stack_status
+        self.stack = self._describe_stack()
+        if self.stack is None:
+            raise MKNoSuchStackError
+        status = self.stack.get("StackStatus")
+        self.logger.debug("%s %s", self.stack_name, status)
+        return status
 
     def _assign_outputs(self):
         """
-        Moves keys and values from boto output objects into dict.
+        Moves keys and values from CloudFormation outputs into a dict.
         """
         self.stack_outputs = {}
-        for output in self.stack.outputs:
-            self.stack_outputs[output.key] = output.value
+        for output in self.stack.get("Outputs", []) or []:
+            self.stack_outputs[output["OutputKey"]] = output["OutputValue"]
         self._custom_output_transform()
 
     def _custom_output_transform(self):

majorkirby/majorkirby.py

@@ -10,17 +10,17 @@
 ) as f:
     long_description = f.read()
 
-tests_require = ["moto >=0.4.1"]
+tests_require = ["moto[cloudformation] >=4.0.0"]
 
 setup(
     name="majorkirby",
-    version="1.0.0",
+    version="2.0.0",
     description="Puts CloudFormation stacks into motion.",
     author="Sharp Hall",
     author_email="shall@azavea.com",
     keywords="aws cloudformation",
     packages=find_packages(exclude=["tests"]),
-    install_requires=["troposphere>=0.7.2", "boto>=2.38.0"],
+    install_requires=["troposphere>=0.7.2", "boto3>=1.9.0"],
     extras_require={"dev": [], "test": tests_require},
     test_suite="tests",
     tests_require=tests_require,
@@ -29,6 +29,9 @@
         "Intended Audience :: Developers",
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
     ],
 )

setup.py

@@ -2,7 +2,7 @@
 
 from majorkirby import GlobalConfigNode, StackNode
 from troposphere import Output
-from moto import mock_cloudformation_deprecated
+from moto import mock_aws
 
 
 class FirstStackNode(StackNode):
@@ -22,7 +22,7 @@ def set_up_stack(self):
 
 
 class TestStackNode(unittest.TestCase):
-    @mock_cloudformation_deprecated
+    @mock_aws
     def test_stack_threading(self):
         global_config = GlobalConfigNode(**{"test": "joker"})