Merge pull request #1028 from gerrod3/patchback/backports/3.10/c7cfdde34b5dfcb855530144da4b1ac3ee0ba176/pr-1023

Patchback/backports/3.10/c7cfdde34b5dfcb855530144da4b1ac3ee0ba176/pr 1023

Author: gerrod3

.github/workflows/publish.yml

@@ -23,47 +23,28 @@ jobs:
     runs-on: "ubuntu-latest"
     needs:
       - "build"
-
-    env:
-      GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+    environment:
+      name: "pypi"
+      url: "https://pypi.org/p/pulp-python"
+    permissions:
+      id-token: "write"
 
     steps:
-      - uses: "actions/checkout@v4"
-        with:
-          fetch-depth: 1
-          path: "pulp_python"
-
       - uses: "actions/download-artifact@v4"
         with:
           name: "plugin_package"
-          path: "pulp_python/dist/"
+          path: "dist/"
 
-      - uses: "actions/setup-python@v5"
-        with:
-          python-version: "3.11"
-
-      - name: "Install python dependencies"
-        run: |
-          echo ::group::PYDEPS
-          pip install twine
-          echo ::endgroup::
-
-      - name: "Setting secrets"
-        run: |
-          python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT"
-        env:
-          SECRETS_CONTEXT: "${{ toJson(secrets) }}"
-
-      - name: "Deploy plugin to pypi"
-        run: |
-          .github/workflows/scripts/publish_plugin_pypi.sh ${{ github.ref_name }}
+      - name: "Publish package to PyPI"
+        uses: pypa/gh-action-pypi-publish@release/v1
   publish-python-bindings:
     runs-on: "ubuntu-latest"
     needs:
       - "build"
-
-    env:
-      GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+    environment:
+      name: "pypi"
+    permissions:
+      id-token: "write"
 
     steps:
       - uses: "actions/checkout@v4"
@@ -81,32 +62,18 @@ jobs:
         run: |
           tar -xvf python-python-client.tar
 
-      - uses: "actions/setup-python@v5"
-        with:
-          python-version: "3.11"
-
-      - name: "Install python dependencies"
-        run: |
-          echo ::group::PYDEPS
-          pip install twine
-          echo ::endgroup::
-
-      - name: "Setting secrets"
-        run: |
-          python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT"
-        env:
-          SECRETS_CONTEXT: "${{ toJson(secrets) }}"
-
       - name: "Publish client to pypi"
-        run: |
-          bash .github/workflows/scripts/publish_client_pypi.sh ${{ github.ref_name }}
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          packages-dir: "pulp_python/dist/"
   publish-ruby-bindings:
     runs-on: "ubuntu-latest"
     needs:
       - "build"
-
-    env:
-      GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+    environment:
+      name: "rubygems"
+    permissions:
+      id-token: "write"
 
     steps:
       - uses: "actions/checkout@v4"
@@ -128,15 +95,12 @@ jobs:
         with:
           ruby-version: "2.6"
 
-      - name: "Setting secrets"
-        run: |
-          python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT"
-        env:
-          SECRETS_CONTEXT: "${{ toJson(secrets) }}"
+      - name: "Set RubyGems Credentials"
+        uses: "rubygems/configure-rubygems-credentials@v1.0.0"
 
-      - name: "Publish client to rubygems"
+      - name: "Publish client to RubyGems"
         run: |
-          bash .github/workflows/scripts/publish_client_gem.sh ${{ github.ref_name }}
+          gem push "pulp_python_client-${{ github.ref_name }}.gem"
 
   create-gh-release:
     runs-on: "ubuntu-latest"
@@ -179,14 +143,16 @@ jobs:
 
       - name: "Create release on GitHub"
         uses: "actions/github-script@v7"
+        env:
+          RELEASE_BODY: ${{ steps.get_release_notes.outputs.body }}
         with:
           script: |
-            const { TAG_NAME } = process.env;
+            const { TAG_NAME, RELEASE_BODY } = process.env;
 
             await github.rest.repos.createRelease({
               owner: context.repo.owner,
               repo: context.repo.repo,
               tag_name: TAG_NAME,
-              body: `${{ steps.get_release_notes.outputs.body }}`,
+              body: RELEASE_BODY,
               make_latest: "legacy",
             });

.github/workflows/scripts/publish_client_gem.sh

@@ -8,6 +8,12 @@
 
 [//]: # (towncrier release notes start)
 
+## 3.10.2 (2025-11-18) {: #3.10.2 }
+
+No significant changes
+
+---
+
 ## 3.10.1 (2025-07-23) {: #3.10.1 }
 
 ### Bugfixes

.github/workflows/scripts/publish_client_pypi.sh

@@ -122,6 +122,7 @@ def install(cli_client, package, host=PYPI_URL):
                 "pip",
                 "install",
                 "--no-deps",
+                "--no-build-isolation",
                 "--trusted-host",
                 urlsplit(host).hostname,
                 "--trusted-host",

.github/workflows/scripts/publish_plugin_pypi.sh

@@ -142,20 +142,25 @@
 
 PYTHON_LG_PROJECT_SPECIFIER = [
     "aiohttp",  # matches 7
+    "bcrypt",  # matches 8
     "celery",  # matches 13
+    "crane",  # matches 0
     "Django",  # matches 31
+    "pulp-2to3-migration",  # matches 2
+    "pytz",  # matches 6
     "scipy",  # matches 23
     "setuptools",  # matches 2
     "shelf-reader",  # matches 2
+    "twine",  # matches 14
 ]
-PYTHON_LG_PACKAGE_COUNT = 78
+PYTHON_LG_PACKAGE_COUNT = 108
 PYTHON_LG_FIXTURE_SUMMARY = {PYTHON_CONTENT_NAME: PYTHON_LG_PACKAGE_COUNT}
-PYTHON_LG_FIXTURE_PRERELEASES_SUMMARY = {PYTHON_CONTENT_NAME: 92}
+PYTHON_LG_FIXTURE_PRERELEASES_SUMMARY = {PYTHON_CONTENT_NAME: PYTHON_LG_PACKAGE_COUNT}
 PYTHON_LG_FIXTURE_COUNTS = {
-    "latest_3": 37,
-    "sdist": 24,
-    "bdist_wheel": 54,
-    "multi": 26,  # keep_latest=1, package_types="bdist_wheel", prereleases=False
+    "latest_3": 59,
+    "sdist": 36,
+    "bdist_wheel": 72,
+    "multi": 36,  # keep_latest=1, package_types="bdist_wheel", prereleases=False
 }
 
 DJANGO_LATEST_3 = 4  # latest version has 2 dists, each other has 1

CHANGES.md

@@ -1,10 +1,12 @@
 [tool.towncrier]
 package = "pulp_python"
-filename = "CHANGES.rst"
+filename = "CHANGES.md"
 directory = "CHANGES/"
-title_format = "{version} ({project_date})"
+title_format = "## {version} ({project_date}) {{: #{version} }}"
 template = "CHANGES/.TEMPLATE.md"
-issue_format = "`#{issue} <https://github.com/pulp/pulp_python/issues/{issue}>`__"
+issue_format = "[#{issue}](https://github.com/pulp/pulp_python/issues/{issue})"
+start_string = "[//]: # (towncrier release notes start)\n"
+underlines = ["", "", ""]
 
 [tool.check-manifest]
 ignore = [