From 4097b98654a16baac25fbebbdc571a7148971354 Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 27 Jan 2025 10:02:47 -0600 Subject: [PATCH 1/7] PYTHON-5047 Improve testing of publish workflows --- .github/workflows/release-python.yml | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml index f21d3ed..8e316bd 100644 --- a/.github/workflows/release-python.yml +++ b/.github/workflows/release-python.yml @@ -13,6 +13,8 @@ on: description: "Dry Run?" default: false type: boolean + schedule: + - cron: '30 5 * * *' env: # Changes per repo @@ -20,6 +22,10 @@ env: # Changes per branch SILK_ASSET_GROUP: winkerberos EVERGREEN_PROJECT: winkerberos + # Constant + DRY_RUN: ${{ inputs.dry_run || 'true' }} + FOLLOWING_VERSION: ${{ inputs.following_version || '' }} + VERSION: ${{ inputs.version || '10.10.10.10' }} defaults: run: @@ -48,9 +54,9 @@ jobs: - uses: mongodb-labs/drivers-github-tools/python/pre-publish@v2 id: pre-publish with: - version: ${{ inputs.version }} + version: ${{ env.VERSION }} version_bump_script: ./.github/scripts/bump-version.sh - dry_run: ${{ inputs.dry_run }} + dry_run: ${{ env.DRY_RUN }} build-dist: needs: [pre-publish] @@ -77,8 +83,13 @@ jobs: with: name: all-dist-${{ github.run_id }} path: dist/ + - name: Publish package distributions to TestPyPI + uses: pypa/gh-action-pypi-publish@release/v1 + with: + repository-url: https://test.pypi.org/legacy/ + skip-existing: true - name: Publish package distributions to PyPI - if: startsWith(inputs.dry_run, 'false') + if: startsWith(env.DRY_RUN, 'false') uses: pypa/gh-action-pypi-publish@release/v1 post-publish: @@ -103,11 +114,11 @@ jobs: artifactory_username: ${{ vars.ARTIFACTORY_USERNAME }} - uses: mongodb-labs/drivers-github-tools/python/post-publish@v2 with: - version: ${{ inputs.version }} + version: ${{ env.VERSION }} version_bump_script: ./.github/scripts/bump-version.sh - following_version: ${{ inputs.following_version }} + following_version: ${{ env.FOLLOWING_VERSION }} product_name: ${{ env.PRODUCT_NAME }} silk_asset_group: ${{ env.SILK_ASSET_GROUP }} evergreen_project: ${{ env.EVERGREEN_PROJECT }} token: ${{ github.token }} - dry_run: ${{ inputs.dry_run }} + dry_run: ${{ env.DRY_RUN }} From b9bfaa52c226b311d553885e889dd9149441e084 Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 27 Jan 2025 10:27:23 -0600 Subject: [PATCH 2/7] install uv --- .evergreen/run-tests.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh index 76bf67f..d32d25f 100644 --- a/.evergreen/run-tests.sh +++ b/.evergreen/run-tests.sh @@ -17,6 +17,7 @@ dos2unix -q .venv/Scripts/activate . .venv/Scripts/activate pip install "./mongo-python-driver[test]" pip install -e ./src +pip install uv pushd ./mongo-python-driver TEST_ENTERPRISE_AUTH=1 bash ./.evergreen/run-tests.sh From c79a9e34f6957a2597c7b2b6f0763457a7e16fea Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 27 Jan 2025 13:22:06 -0600 Subject: [PATCH 3/7] fix handling of testpypi --- .github/workflows/release-python.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml index 8e316bd..1bcf61c 100644 --- a/.github/workflows/release-python.yml +++ b/.github/workflows/release-python.yml @@ -88,6 +88,7 @@ jobs: with: repository-url: https://test.pypi.org/legacy/ skip-existing: true + attestations: ${{ env.DRY_RUN }} - name: Publish package distributions to PyPI if: startsWith(env.DRY_RUN, 'false') uses: pypa/gh-action-pypi-publish@release/v1 From cfd7d1140844377af6a333b163a182186621dc9a Mon Sep 17 00:00:00 2001 From: Steven Date: Tue, 28 Jan 2025 09:17:15 -0600 Subject: [PATCH 4/7] fix dry run logic --- .github/workflows/release-python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml index 1bcf61c..eea4308 100644 --- a/.github/workflows/release-python.yml +++ b/.github/workflows/release-python.yml @@ -23,7 +23,7 @@ env: SILK_ASSET_GROUP: winkerberos EVERGREEN_PROJECT: winkerberos # Constant - DRY_RUN: ${{ inputs.dry_run || 'true' }} + DRY_RUN: ${{ inputs.dry_run == 'true' }} FOLLOWING_VERSION: ${{ inputs.following_version || '' }} VERSION: ${{ inputs.version || '10.10.10.10' }} From f409adbc4a29152fa2375e1f5f494ddd1e57f8e5 Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 29 Jan 2025 09:38:00 -0600 Subject: [PATCH 5/7] fix dry run logic --- .github/workflows/release-python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml index eea4308..55631ef 100644 --- a/.github/workflows/release-python.yml +++ b/.github/workflows/release-python.yml @@ -23,7 +23,7 @@ env: SILK_ASSET_GROUP: winkerberos EVERGREEN_PROJECT: winkerberos # Constant - DRY_RUN: ${{ inputs.dry_run == 'true' }} + DRY_RUN: ${{ github.event_name == 'workflow_dispatch' && inputs.dry_run || 'true' }} FOLLOWING_VERSION: ${{ inputs.following_version || '' }} VERSION: ${{ inputs.version || '10.10.10.10' }} From c3c6a02526f63b112c94c0f76f9a27f1b9114ae7 Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 29 Jan 2025 11:14:02 -0600 Subject: [PATCH 6/7] fix integ tests --- .evergreen/run-tests.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh index d32d25f..4a80a23 100644 --- a/.evergreen/run-tests.sh +++ b/.evergreen/run-tests.sh @@ -17,9 +17,15 @@ dos2unix -q .venv/Scripts/activate . .venv/Scripts/activate pip install "./mongo-python-driver[test]" pip install -e ./src -pip install uv +export CLIENT_PEM="$DRIVERS_TOOLS/.evergreen/x509gen/client.pem" +export CA_PEM="$DRIVERS_TOOLS/.evergreen/x509gen/ca.pem" +export GSSAPI_PASS=${SASL_PASS} +export GSSAPI_CANONICALIZE="true" +export GSSAPI_HOST=${SASL_HOST} +export GSSAPI_PORT=${SASL_PORT} +export GSSAPI_PRINCIPAL=${PRINCIPAL} pushd ./mongo-python-driver -TEST_ENTERPRISE_AUTH=1 bash ./.evergreen/run-tests.sh +pytest -m auth popd popd From 490a53a0d60f3979cd8f1e13daff7ad45a720cdc Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 29 Jan 2025 11:19:38 -0600 Subject: [PATCH 7/7] disable warnings --- .evergreen/run-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh index 4a80a23..1e86cee 100644 --- a/.evergreen/run-tests.sh +++ b/.evergreen/run-tests.sh @@ -26,6 +26,6 @@ export GSSAPI_HOST=${SASL_HOST} export GSSAPI_PORT=${SASL_PORT} export GSSAPI_PRINCIPAL=${PRINCIPAL} pushd ./mongo-python-driver -pytest -m auth +pytest -W default -m auth popd popd