Imported Upstream version 51.1.2

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 60e7352f593924935b9b9c8edcf5813d5161f06f..432c813062efa387fb928583792a17c9d6ff6c19 100644 (file)
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 51.1.1
+current_version = 51.1.2
 commit = True
 tag = True
 

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
new file mode 100644 (file)
index 0000000..4f70acf
--- /dev/null
+++ b/.github/workflows/automerge.yml
@@ -0,0 +1,27 @@
+name: automerge
+on:
+  pull_request:
+    types:
+      - labeled
+      - unlabeled
+      - synchronize
+      - opened
+      - edited
+      - ready_for_review
+      - reopened
+      - unlocked
+  pull_request_review:
+    types:
+      - submitted
+  check_suite:
+    types:
+      - completed
+  status: {}
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: automerge
+        uses: "pascalgn/automerge-action@v0.12.0"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

diff --git a/CHANGES.rst b/CHANGES.rst
index ca76648bd2178c3abe97437bd21b78e40d0a2e3c..5f69c6abbcfa640ddcc4d98e600776d795c55e21 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+v51.1.2
+-------
+
+
+Misc
+^^^^
+* #2505: Disable inclusion of package data as it causes 'tests' to be included as data.
+
+
 v51.1.1
 -------
 

diff --git a/setup.cfg b/setup.cfg
index 9d41be119cebcb7a925e05ce07bdc18b396751a7..dff72caf38bcfb44c17b8c05a46d57dafe72ef4a 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,7 @@
 [metadata]
 license_file = LICENSE
 name = setuptools
-version = 51.1.1
+version = 51.1.2
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages
@@ -24,7 +24,8 @@ project_urls =
 [options]
 packages = find:
 py_modules = easy_install
-include_package_data = true
+# disabled as it causes tests to be included #2505
+# include_package_data = true
 python_requires = >=3.6
 install_requires =
 
@@ -57,7 +58,7 @@ docs =
     # Keep these in sync with docs/requirements.txt
        # upstream
        sphinx
-       jaraco.packaging >= 6.1
+       jaraco.packaging >= 8.2
        rst.linker >= 1.9
 
        # local

diff --git a/skeleton.md b/skeleton.md
index ec421c2598d702aaac4b7b43d9250d22236a0fe7..dd8ec014cdb3598fe699ce3fcbabeb1d92e635ef 100644 (file)
--- a/skeleton.md
+++ b/skeleton.md
@@ -46,6 +46,26 @@ For example, here's a session of the [path project](https://pypi.org/project/pat
 
 Thereafter, the target project can make whatever customizations it deems relevant to the scaffolding. The project may even at some point decide that the divergence is too great to merit renewed merging with the original skeleton. This approach applies maximal guidance while creating minimal constraints.
 
+## Periodic Collapse
+
+In late 2020, this project [introduced](https://github.com/jaraco/skeleton/issues/27) the idea of a periodic but infrequent (O(years)) collapse of commits to limit the number of commits a new consumer will need to accept to adopt the skeleton.
+
+The full history of commits is collapsed into a single commit and that commit becomes the new mainline head.
+
+When one of these collapse operations happens, any project that previously pulled from the skeleton will no longer have a related history with that new main branch. For those projects, the skeleton provides a "handoff" branch that reconciles the two branches. Any project that has previously merged with the skeleton but now gets an error "fatal: refusing to merge unrelated histories" should instead use the handoff branch once to incorporate the new main branch.
+
+```
+$ git pull https://github.com/jaraco/skeleton 2020-handoff
+```
+
+This handoff needs to be pulled just once and thereafter the project can pull from the main head.
+
+The archive and handoff branches from prior collapses are indicate here:
+
+| refresh | archive         | handoff      |
+|---------|-----------------|--------------|
+| 2020-12 | archive/2020-12 | 2020-handoff |
+
 # Features
 
 The features/techniques employed by the skeleton include: