Merge branch 'main' into fix-easy-install-pth-file-not-reloaded-befor…

…e-save

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 60.9.3
+current_version = 67.7.2
 commit = True
 tag = True
 

.coveragerc

@@ -2,6 +2,11 @@
 omit =
 	# leading `*/` for pytest-dev/pytest-cov#456
 	*/.tox/*
+disable_warnings =
+	couldnt-parse
+
+	# local
+	*/_validate_pyproject/*  # generated code, tested in `validate-pyproject`
 
 [report]
 show_missing = True

.editorconfig

@@ -14,3 +14,6 @@ max_line_length = 88
 [*.{yml,yaml}]
 indent_style = space
 indent_size = 2
+
+[*.rst]
+indent_style = space

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -95,8 +95,13 @@ body:
     label: How to Reproduce
     description: >-
       Describe the steps to reproduce this bug.
+      
+      Please try to create a [minimal reproducer](https://stackoverflow.com/help/minimal-reproducible-example),
+      and avoid things like "see the steps in the CI logs".
     placeholder: |
-      1. Integrate setuptools via '...'
+      1. Clone a simplified example: `git clone ...`
+      2. Create a virtual environment for isolation with `...`
+      2. Build the project with setuptools via '...'
       2. Then run '...'
       3. An error occurs.
   validations:

.github/workflows/ci-sage.yml

@@ -37,6 +37,9 @@ on:
   push:
     tags:
       - '*'
+  pull_request:
+    paths:
+      - .github/workflows/ci-sage.yml
   workflow_dispatch:
     # Allow to run manually
 
@@ -45,19 +48,6 @@ env:
   DIST_PREREQ: python3
   # Name of this project in the Sage distribution
   SPKG:        setuptools
-  # Sage distribution packages to build
-  TARGETS_PRE: build/make/Makefile
-  TARGETS:     setuptools pyzmq
-  TARGETS_OPTIONAL: build/make/Makefile
-  # Standard setting: Test the current beta release of Sage:
-  SAGE_REPO:   sagemath/sage
-  SAGE_REF:    develop
-  # Test with the branch from https://trac.sagemath.org/ticket/33288
-  # This may provide hotfixes for the CI that have not been merged into
-  # the sage develop branch yet.
-  SAGE_TRAC_GIT:  https://github.com/sagemath/sagetrac-mirror.git
-  SAGE_TICKET:    33288
-  REMOVE_PATCHES: "*"
 
 jobs:
 
@@ -85,68 +75,23 @@ jobs:
           path: upstream
           name: upstream
 
-  docker:
-    runs-on: ubuntu-latest
+  linux:
+    # https://github.com/sagemath/sage/blob/develop/.github/workflows/docker.yml
+    # Use branch of ticket https://trac.sagemath.org/ticket/33288
+    uses: sagemath/sagetrac-mirror/.github/workflows/docker.yml@u/mkoeppe/setuptools_ci_target
+    with:
+      # Sage distribution packages to build
+      targets: setuptools pyzmq
+      # Standard setting: Test the current beta release of Sage:
+      sage_repo: sagemath/sage
+      sage_ref: develop
+      upstream_artifact: upstream
+      sage_trac_git: https://github.com/sagemath/sagetrac-mirror.git
+      # Test with the branch from https://trac.sagemath.org/ticket/33288
+      # This may provide hotfixes for the CI that have not been merged into
+      # the sage develop branch yet.
+      sage_trac_ticket: 33288
+      # We prefix the image name with the SPKG name ("setuptools-") to avoid the error
+      # 'Package "sage-docker-..." is already associated with another repository.'
+      docker_push_repository: ghcr.io/${{ github.repository }}/setuptools-
     needs: [dist]
-    strategy:
-      fail-fast: false
-      max-parallel: 32
-      matrix:
-        tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-hirsute, ubuntu-impish, ubuntu-jammy, debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2, linuxmint-20.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, centos-7, centos-stream-8, centos-stream-9, gentoo-python3.9, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386]
-        tox_packages_factor: [minimal, standard]
-    env:
-      TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
-      LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
-      DOCKER_TARGETS: configured with-targets with-targets-optional
-    steps:
-      - name: Check out SageMath
-        uses: actions/checkout@v2
-        with:
-          repository: ${{ env.SAGE_REPO }}
-          ref: ${{ env.SAGE_REF }}
-          fetch-depth: 2000
-        if: env.SAGE_REPO != ''
-      - name: Check out git-trac-command
-        uses: actions/checkout@v2
-        with:
-          repository: sagemath/git-trac-command
-          path: git-trac-command
-        if: env.SAGE_TRAC_GIT != ''
-      - name: Check out SageMath from trac.sagemath.org
-        shell: bash {0}
-        run: |
-          git config --global user.email "[email protected]"
-          git config --global user.name "ci-sage workflow"
-          if [ ! -d .git ]; then git init; fi; git remote add trac ${{ env.SAGE_TRAC_GIT }} && x=1 && while [ $x -le 5 ]; do x=$(( $x + 1 )); sleep $(( $RANDOM % 60 + 1 )); if git-trac-command/git-trac fetch $SAGE_TICKET; then git merge FETCH_HEAD || echo "(ignored)"; exit 0; fi; sleep 40; done; exit 1
-        if: env.SAGE_TRAC_GIT != ''
-      - uses: actions/download-artifact@v2
-        with:
-          path: upstream
-          name: upstream
-      - name: Install test prerequisites
-        run: |
-          sudo DEBIAN_FRONTEND=noninteractive apt-get update
-          sudo DEBIAN_FRONTEND=noninteractive apt-get install tox python3-setuptools
-      - name: Update Sage packages from upstream artifact
-        run: |
-          (export PATH=$(pwd)/build/bin:$PATH; (cd upstream && bash -x update-pkgs.sh) && sed -i.bak '/upstream/d' .dockerignore && echo "/:toolchain:/i ADD upstream upstream" | sed -i.bak -f - build/bin/write-dockerfile.sh && git diff)
-      - name: Configure and build Sage distribution within a Docker container
-        run: |
-          set -o pipefail; EXTRA_DOCKER_BUILD_ARGS="--build-arg USE_MAKEFLAGS=\"-k V=0 SAGE_NUM_THREADS=3\"" tox -e $TOX_ENV -- $TARGETS 2>&1 | sed "/^configure: notice:/s|^|::warning file=artifacts/$LOGS_ARTIFACT_NAME/config.log::|;/^configure: warning:/s|^|::warning file=artifacts/$LOGS_ARTIFACT_NAME/config.log::|;/^configure: error:/s|^|::error file=artifacts/$LOGS_ARTIFACT_NAME/config.log::|;"
-      - name: Copy logs from the Docker image or build container
-        run: |
-          mkdir -p "artifacts/$LOGS_ARTIFACT_NAME"
-          cp -r .tox/$TOX_ENV/Dockerfile .tox/$TOX_ENV/log "artifacts/$LOGS_ARTIFACT_NAME"
-          if [ -f .tox/$TOX_ENV/Dockertags ]; then CONTAINERS=$(docker create $(tail -1 .tox/$TOX_ENV/Dockertags) /bin/bash || true); fi
-          if [ -n "$CONTAINERS" ]; then for CONTAINER in $CONTAINERS; do for ARTIFACT in /sage/logs; do docker cp $CONTAINER:$ARTIFACT artifacts/$LOGS_ARTIFACT_NAME && HAVE_LOG=1; done; if [ -n "$HAVE_LOG" ]; then break; fi; done; fi
-        if: always()
-      - uses: actions/upload-artifact@v2
-        with:
-          path: artifacts
-          name: ${{ env.LOGS_ARTIFACT_NAME }}
-        if: always()
-      - name: Print out logs for immediate inspection
-        # and markup the output with GitHub Actions logging commands
-        run: |
-          .github/workflows/scan-logs.sh "artifacts/$LOGS_ARTIFACT_NAME"
-        if: always()