From 9c6854ab784bb3c435f5a2885b872a4fce6b2ceb Mon Sep 17 00:00:00 2001 From: Charles Moore <122481442+moorec-aws@users.noreply.github.com> Date: Sat, 30 Mar 2024 05:25:45 +0000 Subject: [PATCH 1/3] feat!: public release Signed-off-by: Charles Moore <122481442+moorec-aws@users.noreply.github.com> --- .github/workflows/release_publish.yml | 21 ++------------------- .github/workflows/reuse_python_build.yml | 14 -------------- hatch.toml | 2 -- pyproject.toml | 4 ++-- 4 files changed, 4 insertions(+), 37 deletions(-) diff --git a/.github/workflows/release_publish.yml b/.github/workflows/release_publish.yml index 257fbb5..6cc8fe9 100644 --- a/.github/workflows/release_publish.yml +++ b/.github/workflows/release_publish.yml @@ -41,11 +41,6 @@ jobs: permissions: id-token: write contents: write - env: - CODEARTIFACT_REGION: "us-west-2" - CODEARTIFACT_DOMAIN: ${{ secrets.CODEARTIFACT_DOMAIN }} - CODEARTIFACT_ACCOUNT_ID: ${{ secrets.CODEARTIFACT_ACCOUNT_ID }} - CODEARTIFACT_REPOSITORY: ${{ secrets.CODEARTIFACT_REPOSITORY }} steps: - name: Checkout uses: actions/checkout@v4 @@ -88,17 +83,9 @@ jobs: echo EOF } >> $GITHUB_ENV - - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v4 - with: - role-to-assume: ${{ secrets.AWS_CODEARTIFACT_ROLE }} - aws-region: us-west-2 - mask-aws-account-id: true - # Tag must be made before building so the generated _version.py files have the correct version - name: Build run: | - export CODEARTIFACT_AUTH_TOKEN=$(aws codeartifact get-authorization-token --domain ${{ secrets.CODEARTIFACT_DOMAIN }} --domain-owner ${{ secrets.CODEARTIFACT_ACCOUNT_ID }} --query authorizationToken --output text --region us-west-2) pip install --upgrade hatch hatch -v build @@ -187,9 +174,6 @@ jobs: - name: Install dependencies run: | - CODEARTIFACT_AUTH_TOKEN=$(aws codeartifact get-authorization-token --domain ${{ secrets.CODEARTIFACT_DOMAIN }} --domain-owner ${{ secrets.CODEARTIFACT_ACCOUNT_ID }} --query authorizationToken --output text --region us-west-2) - echo "::add-mask::$CODEARTIFACT_AUTH_TOKEN" - echo CODEARTIFACT_AUTH_TOKEN=$CODEARTIFACT_AUTH_TOKEN >> $GITHUB_ENV pip install --upgrade hatch pip install --upgrade twine @@ -210,7 +194,6 @@ jobs: export TWINE_REPOSITORY_URL=`aws codeartifact get-repository-endpoint --domain ${{ secrets.CUSTOMER_DOMAIN }} --domain-owner ${{ secrets.CODEARTIFACT_ACCOUNT_ID }} --repository ${{ secrets.CUSTOMER_REPOSITORY }} --format pypi --query repositoryEndpoint --output text` twine upload dist/* - # TODO: Uncomment this block to publish to PyPI once this package is public # # See https://docs.github.com/en/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-pypi - # - name: Publish to PyPI - # uses: pypa/gh-action-pypi-publish@release/v1 + - name: Publish to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/.github/workflows/reuse_python_build.yml b/.github/workflows/reuse_python_build.yml index 180d520..668da9f 100644 --- a/.github/workflows/reuse_python_build.yml +++ b/.github/workflows/reuse_python_build.yml @@ -18,10 +18,6 @@ jobs: python-version: ['3.9', '3.10', '3.11'] env: PYTHON: ${{ matrix.python-version }} - CODEARTIFACT_REGION: "us-west-2" - CODEARTIFACT_DOMAIN: ${{ secrets.CODEARTIFACT_DOMAIN }} - CODEARTIFACT_ACCOUNT_ID: ${{ secrets.CODEARTIFACT_ACCOUNT_ID }} - CODEARTIFACT_REPOSITORY: ${{ secrets.CODEARTIFACT_REPOSITORY }} steps: - uses: actions/checkout@v4 if: ${{ !inputs.branch }} @@ -36,19 +32,9 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - - - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v4 - with: - role-to-assume: ${{ secrets.AWS_CODEARTIFACT_ROLE }} - aws-region: us-west-2 - mask-aws-account-id: true - name: Install Hatch run: | - CODEARTIFACT_AUTH_TOKEN=$(aws codeartifact get-authorization-token --domain ${{ secrets.CODEARTIFACT_DOMAIN }} --domain-owner ${{ secrets.CODEARTIFACT_ACCOUNT_ID }} --query authorizationToken --output text --region us-west-2) - echo "::add-mask::$CODEARTIFACT_AUTH_TOKEN" - echo CODEARTIFACT_AUTH_TOKEN=$CODEARTIFACT_AUTH_TOKEN >> $GITHUB_ENV pip install --upgrade hatch - name: Run Linting diff --git a/hatch.toml b/hatch.toml index 9544fd5..1c83424 100644 --- a/hatch.toml +++ b/hatch.toml @@ -25,7 +25,6 @@ install = "python {root}/scripts/install_dev_submitter.py {args:}" python = ["3.7", "3.8", "3.9", "3.10", "3.11"] [envs.default.env-vars] -PIP_INDEX_URL="https://aws:{env:CODEARTIFACT_AUTH_TOKEN}@{env:CODEARTIFACT_DOMAIN}-{env:CODEARTIFACT_ACCOUNT_ID}.d.codeartifact.{env:CODEARTIFACT_REGION}.amazonaws.com/pypi/{env:CODEARTIFACT_REPOSITORY}/simple/" SKIP_BOOTSTRAP_TEST_RESOURCES="True" MAYA_ENV_DIR="{root}/plugin_env" @@ -33,7 +32,6 @@ MAYA_ENV_DIR="{root}/plugin_env" build = "hatch build" [envs.codebuild.env-vars] -PIP_INDEX_URL="" SKIP_BOOTSTRAP_TEST_RESOURCES="True" [envs.integ.scripts] diff --git a/pyproject.toml b/pyproject.toml index d777088..44cbbc8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,8 +27,8 @@ classifiers = [ ] dependencies = [ - "deadline == 0.45.*", - "openjd-adaptor-runtime == 0.6.*", + "deadline == 0.47.*", + "openjd-adaptor-runtime == 0.7.*", ] [project.urls] From e0831c6a40973408f41badb5874707e80e95ba0a Mon Sep 17 00:00:00 2001 From: Samuel Anderson <119458760+AWS-Samuel@users.noreply.github.com> Date: Mon, 1 Apr 2024 21:22:32 +0000 Subject: [PATCH 2/3] chore: update minimum python version to 3.8 Signed-off-by: Samuel Anderson <119458760+AWS-Samuel@users.noreply.github.com> --- hatch.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hatch.toml b/hatch.toml index 1c83424..b26ee67 100644 --- a/hatch.toml +++ b/hatch.toml @@ -22,7 +22,7 @@ lint = [ install = "python {root}/scripts/install_dev_submitter.py {args:}" [[envs.all.matrix]] -python = ["3.7", "3.8", "3.9", "3.10", "3.11"] +python = ["3.8", "3.9", "3.10", "3.11"] [envs.default.env-vars] SKIP_BOOTSTRAP_TEST_RESOURCES="True" From 99a1007e54350ec1339c3f6cec7b80df37c03f77 Mon Sep 17 00:00:00 2001 From: Morgan Epp <60796713+epmog@users.noreply.github.com> Date: Mon, 1 Apr 2024 16:57:43 -0500 Subject: [PATCH 3/3] chore: add authors Signed-off-by: Morgan Epp <60796713+epmog@users.noreply.github.com> --- pyproject.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 44cbbc8..4a6a99b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,6 +4,9 @@ build-backend = "hatchling.build" [project] name = "deadline-cloud-for-maya" +authors = [ + {name = "Amazon Web Services"}, +] dynamic = ["version"] readme = "README.md" license = "Apache-2.0"