From ca095e9dce582294fe2cec4799874f3f5a65337e Mon Sep 17 00:00:00 2001 From: Charles Moore <122481442+moorec-aws@users.noreply.github.com> Date: Sat, 30 Mar 2024 20:12:40 +0000 Subject: [PATCH] chore: add pypi classifiers Signed-off-by: Charles Moore <122481442+moorec-aws@users.noreply.github.com> --- .github/PULL_REQUEST_TEMPLATE.md | 6 +++++- .github/workflows/release_bump.yml | 1 + README.md | 4 ++-- hatch.toml | 4 +--- pyproject.toml | 16 ++++++++++++++++ requirements-release.txt | 2 -- requirements-testing.txt | 2 +- src/deadline_test_fixtures/cloudformation/cfn.py | 6 +++--- 8 files changed, 29 insertions(+), 12 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index e41006d..07e5be9 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -8,4 +8,8 @@ ### Was this change documented? -### Is this a breaking change? \ No newline at end of file +### Is this a breaking change? + +---- + +*By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.* \ No newline at end of file diff --git a/.github/workflows/release_bump.yml b/.github/workflows/release_bump.yml index d07016f..f36f728 100644 --- a/.github/workflows/release_bump.yml +++ b/.github/workflows/release_bump.yml @@ -63,6 +63,7 @@ jobs: # Run semantic-release to generate new changelog pip install --upgrade hatch hatch env create release + hatch run release:deps NEXT_SEMVER=$(hatch run release:bump $BUMP_ARGS) # Grab the new version's changelog and prepend it to the original changelog contents diff --git a/README.md b/README.md index 2183471..6af27da 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Deadline Cloud Test Fixtures +# AWS Deadline Cloud Test Fixtures -This package contains pytest fixtures that are used to test Deadline Cloud Python packages. +This package contains pytest fixtures that are used to test AWS Deadline Cloud Python packages. ## Usage diff --git a/hatch.toml b/hatch.toml index 88ac3d5..5053f19 100644 --- a/hatch.toml +++ b/hatch.toml @@ -36,10 +36,8 @@ SKIP_BOOTSTRAP_TEST_RESOURCES="True" [envs.release] detached = true -dependencies = [ - "python-semantic-release == 8.7.*" -] [envs.release.scripts] +deps = "pip install -r requirements-release.txt" bump = "semantic-release -v --strict version --no-push --no-commit --no-tag --skip-build {args}" version = "semantic-release -v --strict version --print {args}" diff --git a/pyproject.toml b/pyproject.toml index 00fc537..c9c28f3 100755 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,6 +6,22 @@ build-backend = "hatchling.build" name = "deadline-cloud-test-fixtures" dynamic = ["version"] requires-python = ">=3.7" +description = "This package contains pytest fixtures that are used to test AWS Deadline Cloud Python packages." +# https://pypi.org/classifiers/ +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Programming Language :: Python", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Operating System :: POSIX :: Linux", + "Operating System :: Microsoft :: Windows", + "Operating System :: MacOS", + "License :: OSI Approved :: Apache Software License", + "Intended Audience :: Developers", +] # Note: All deps should be using >= since this is a *library*. Applications that # consume this library should be the ones that are more strictly limiting dependencies diff --git a/requirements-release.txt b/requirements-release.txt index 2f7766c..1b5560d 100644 --- a/requirements-release.txt +++ b/requirements-release.txt @@ -1,3 +1 @@ -# HACK: This file solely exists for dependabot checks. The actual dependencies are in `hatch.toml` in the `release` environment. -# If dependabot opens a PR that modifies this file, please make sure to update the coresponding dependency in `hatch.toml` as well. python-semantic-release == 8.7.* \ No newline at end of file diff --git a/requirements-testing.txt b/requirements-testing.txt index b813453..eb188d8 100644 --- a/requirements-testing.txt +++ b/requirements-testing.txt @@ -3,7 +3,7 @@ pytest == 8.1.* pytest-cov == 4.1.* pytest-timeout == 2.2.* pytest-xdist == 3.5.* -black == 23.12.* +black == 24.3.* moto[cloudformation,s3] == 4.2.* mypy == 1.8.* ruff == 0.3.* diff --git a/src/deadline_test_fixtures/cloudformation/cfn.py b/src/deadline_test_fixtures/cloudformation/cfn.py index 579178b..127e72a 100644 --- a/src/deadline_test_fixtures/cloudformation/cfn.py +++ b/src/deadline_test_fixtures/cloudformation/cfn.py @@ -175,9 +175,9 @@ def __init__( logging_config = ( clean_kwargs( { - "DestinationBucketName": logging.destination_bucket.ref - if logging.destination_bucket - else None, + "DestinationBucketName": ( + logging.destination_bucket.ref if logging.destination_bucket else None + ), "LogFilePrefix": logging.log_file_prefix, } )