gistfile1.txt

 distutils main @ git rebase -i 55982565e --rebase-merges
[detached HEAD 491cd2473] Merge pull request pypa/distutils#245 from DimitriPapadopoulos/FURB
 Date: Sat Apr 13 09:32:32 2024 -0400
[detached HEAD b3406caf9] Merge pull request pypa/distutils#247 from pypa/hotfix/246-linker-args-list
 Date: Sat Apr 13 16:40:32 2024 -0400
[detached HEAD 20a372ef0] Merge pull request pypa/distutils#239 from DimitriPapadopoulos/extra_pairs_of_quotes
 Date: Sat Apr 13 20:16:59 2024 -0400
Auto-merging pyproject.toml
CONFLICT (content): Merge conflict in pyproject.toml
Recorded preimage for 'pyproject.toml'
Could not apply 851e71af1... Merge-https-github-com-jaraco-skeleton # Merge https://github.com/jaraco/skeleton
 distutils d8ccaf18f [1] @ git checkout 851e71af1 pyproject.toml
Updated 1 path from d00aa9cd6
 distutils d8ccaf18f @ git diff
 distutils d8ccaf18f @ git status
interactive rebase in progress; onto 55982565e
Last commands done (45 commands done):
   pick 6c1cb0885 Migrated config to pyproject.toml using jaraco.develop.migrate-config and ini2toml.
   merge -C 851e71af19e43fed26e819fab746604a128b0d4d Merge-https-github-com-jaraco-skeleton # Merge https://github.com/jaraco/skeleton
  (see more in file .git/rebase-merge/done)
Next commands to do (118 remaining commands):
   pick 7dcde5e3c Extract _make_executable for TestSpawn.
   pick 041c42e7e Move and reword comment for brevity and clarity.
  (use "git rebase --edit-todo" to view and edit)

All conflicts fixed but you are still merging.
  (use "git commit" to conclude merge)

 distutils d8ccaf18f @ git rebase --continue
Auto-merging .github/workflows/main.yml
Auto-merging pyproject.toml
CONFLICT (content): Merge conflict in pyproject.toml
Resolved 'pyproject.toml' using previous resolution.
Could not apply e5b06e144... Merge-https-github-com-jaraco-skeleton-2 # Merge https://github.com/jaraco/skeleton
 distutils de48bf21f [1] @ git checkout e5b06e144 .
Updated 1 path from 4187505b1
 distutils de48bf21f @ git rebase --continue
[detached HEAD 8980c8cda] Merge https://github.com/jaraco/skeleton
Auto-merging .github/workflows/main.yml
Auto-merging pyproject.toml
Auto-merging tox.ini
Auto-merging pyproject.toml
CONFLICT (content): Merge conflict in pyproject.toml
Resolved 'pyproject.toml' using previous resolution.
Could not apply 0de29d354... Merge-https-github-com-jaraco-skeleton-4 # Merge https://github.com/jaraco/skeleton
 distutils b93a0ba42 [1] @ git checkout 0de29d354; git rebase --continue
pyproject.toml: needs merge
error: you need to resolve your current index first
pyproject.toml: needs merge
You must edit all merge conflicts and then
mark them as resolved using git add
 distutils b93a0ba42 [1] @ git checkout 0de29d354. ; git rebase --continue
error: pathspec '0de29d354.' did not match any file(s) known to git
pyproject.toml: needs merge
You must edit all merge conflicts and then
mark them as resolved using git add
 distutils b93a0ba42 [1] @ git checkout 0de29d354 . ; git rebase --continue
Updated 1 path from 97fe11901
[detached HEAD 6bf6b9e93] Merge https://github.com/jaraco/skeleton
[detached HEAD 72b440794] Merge pull request pypa/distutils#260 from brenns10/main
 Date: Wed Jun 26 16:36:16 2024 -0400
[detached HEAD 6909af120] Merge pull request pypa/distutils#250 from pypa/debt/remove-find-executable
 Date: Wed Jun 26 16:45:19 2024 -0400
Auto-merging .coveragerc
CONFLICT (content): Merge conflict in .coveragerc
Auto-merging conftest.py
Auto-merging distutils/dist.py
Auto-merging distutils/tests/test_sdist.py
Resolved '.coveragerc' using previous resolution.
Could not apply dbcb7c852... main # Merge branch 'main' into feature/canonicalize-fullname
 distutils c28f347e9 [1] @ git checkout dbcb7c852 .; git rebase --continue
Updated 1 path from 4de690629
[detached HEAD 50763b6df] Merge branch 'main' into feature/canonicalize-fullname
[detached HEAD c67b200ea] Merge pull request pypa/distutils#244 from pypa/feature/canonicalize-fullname
 Date: Thu Jun 27 04:38:32 2024 -0400
[detached HEAD e79d24489] Merge pull request pypa/distutils#254 from DimitriPapadopoulos/RUF100
 Date: Thu Jun 27 04:48:19 2024 -0400
Auto-merging distutils/dist.py
Auto-merging ruff.toml
[detached HEAD cb7f154a9] Merge pull request pypa/distutils#257 from DimitriPapadopoulos/RUF010
 Date: Thu Jun 27 04:52:14 2024 -0400
Auto-merging distutils/bcppcompiler.py
Auto-merging distutils/command/bdist_dumb.py
Auto-merging distutils/command/bdist_rpm.py
CONFLICT (content): Merge conflict in distutils/command/bdist_rpm.py
Auto-merging distutils/command/build.py
Auto-merging distutils/dist.py
CONFLICT (content): Merge conflict in distutils/dist.py
Auto-merging distutils/msvccompiler.py
Auto-merging distutils/tests/__init__.py
Auto-merging distutils/util.py
Auto-merging distutils/version.py
CONFLICT (content): Merge conflict in distutils/version.py
Auto-merging ruff.toml
CONFLICT (content): Merge conflict in ruff.toml
Resolved 'distutils/command/bdist_rpm.py' using previous resolution.
Resolved 'distutils/dist.py' using previous resolution.
Resolved 'distutils/version.py' using previous resolution.
Resolved 'ruff.toml' using previous resolution.
Could not apply 937f7fdac... main-4 # Merge branch 'main' into UP
 distutils 876576148 [1] @ git checkout 937f7fdac .; git rebase --continue
Updated 4 paths from db8b456ed
[detached HEAD 1072cbd2e] Merge branch 'main' into UP
[detached HEAD a4bdc7221] Merge pull request pypa/distutils#256 from DimitriPapadopoulos/UP
 Date: Thu Jun 27 04:56:54 2024 -0400
Auto-merging distutils/dir_util.py
Auto-merging distutils/dist.py
[detached HEAD a44f2088f] Merge pull request pypa/distutils#252 from Avasam/Use-set-instead-of-True-only-dict
 Date: Thu Jun 27 05:01:17 2024 -0400
Auto-merging distutils/archive_util.py
Auto-merging distutils/bcppcompiler.py
Auto-merging distutils/ccompiler.py
Auto-merging distutils/cmd.py
Auto-merging distutils/command/bdist.py
Auto-merging distutils/command/bdist_dumb.py
Auto-merging distutils/command/bdist_rpm.py
Auto-merging distutils/command/build.py
Auto-merging distutils/command/build_clib.py
Auto-merging distutils/command/build_ext.py
Auto-merging distutils/command/build_py.py
Auto-merging distutils/command/check.py
Auto-merging distutils/command/config.py
Auto-merging distutils/command/install.py
Auto-merging distutils/command/install_lib.py
Auto-merging distutils/command/register.py
Auto-merging distutils/command/sdist.py
Auto-merging distutils/command/upload.py
Auto-merging distutils/config.py
Auto-merging distutils/cygwinccompiler.py
Auto-merging distutils/dir_util.py
CONFLICT (content): Merge conflict in distutils/dir_util.py
Auto-merging distutils/dist.py
CONFLICT (content): Merge conflict in distutils/dist.py
Auto-merging distutils/extension.py
Auto-merging distutils/fancy_getopt.py
Auto-merging distutils/file_util.py
Auto-merging distutils/filelist.py
Auto-merging distutils/msvc9compiler.py
Auto-merging distutils/msvccompiler.py
Auto-merging distutils/sysconfig.py
Auto-merging distutils/tests/test_bdist.py
Auto-merging distutils/tests/test_bdist_rpm.py
Auto-merging distutils/tests/test_build_ext.py
Auto-merging distutils/tests/test_build_py.py
Auto-merging distutils/tests/test_dir_util.py
CONFLICT (content): Merge conflict in distutils/tests/test_dir_util.py
Auto-merging distutils/tests/test_file_util.py
Auto-merging distutils/tests/test_install.py
Auto-merging distutils/util.py
Resolved 'distutils/dir_util.py' using previous resolution.
Recorded preimage for 'distutils/dist.py'
Resolved 'distutils/tests/test_dir_util.py' using previous resolution.
Could not apply 413150743... main-5 # Merge branch 'main' into use-actual-booleans
 distutils 33b5afa4d [1] @ git checkout 413150743 .; git rebase --continue
Updated 3 paths from afa24e2bf
Recorded resolution for 'distutils/dist.py'.
[detached HEAD ef85c76a7] Merge branch 'main' into use-actual-booleans
Auto-merging distutils/command/bdist_dumb.py
Auto-merging distutils/command/bdist_rpm.py
CONFLICT (content): Merge conflict in distutils/command/bdist_rpm.py
Auto-merging distutils/command/build.py
Auto-merging distutils/command/build_ext.py
Auto-merging distutils/command/install.py
Auto-merging distutils/command/register.py
Auto-merging distutils/dist.py
Auto-merging distutils/fancy_getopt.py
Auto-merging ruff.toml
Recorded preimage for 'distutils/command/bdist_rpm.py'
Could not apply e67c0fb8d... main-5 # Merge branch 'main' into ISC
 distutils 5a590b856 [1] @ git checkout e67c0fb8d .; git rebase --continue
Updated 3 paths from 388956abd
Recorded resolution for 'distutils/command/bdist_rpm.py'.
[detached HEAD 9fd0e88b2] Merge branch 'main' into ISC
[detached HEAD 418589c57] Merge pull request pypa/distutils#253 from Avasam/use-actual-booleans
 Date: Thu Jun 27 05:05:25 2024 -0400
Auto-merging .github/workflows/main.yml
Auto-merging distutils/ccompiler.py
CONFLICT (content): Merge conflict in distutils/ccompiler.py
Auto-merging distutils/command/build_ext.py
CONFLICT (content): Merge conflict in distutils/command/build_ext.py
Auto-merging distutils/cygwinccompiler.py
CONFLICT (content): Merge conflict in distutils/cygwinccompiler.py
Auto-merging distutils/sysconfig.py
CONFLICT (content): Merge conflict in distutils/sysconfig.py
Auto-merging distutils/tests/test_cygwinccompiler.py
Auto-merging distutils/tests/test_install.py
CONFLICT (content): Merge conflict in distutils/tests/test_install.py
Auto-merging distutils/tests/test_sysconfig.py
CONFLICT (content): Merge conflict in distutils/tests/test_sysconfig.py
Auto-merging distutils/tests/test_util.py
Auto-merging distutils/util.py
CONFLICT (modify/delete): setup.cfg deleted in refs/rewritten/main-6 and modified in HEAD.  Version HEAD of setup.cfg left in tree.
Resolved 'distutils/ccompiler.py' using previous resolution.
Resolved 'distutils/command/build_ext.py' using previous resolution.
Resolved 'distutils/cygwinccompiler.py' using previous resolution.
Resolved 'distutils/sysconfig.py' using previous resolution.
Resolved 'distutils/tests/test_install.py' using previous resolution.
Resolved 'distutils/tests/test_sysconfig.py' using previous resolution.
Could not apply 5fb38a1e1... main-6 # Merge branch 'main' into add-mingw-support
 distutils bbe7b64f4 [1] @ git checkout 5fb38a1e1 .; git rebase --continue
Updated 7 paths from 74ea8f39c
setup.cfg: needs merge
You must edit all merge conflicts and then
mark them as resolved using git add
 distutils bbe7b64f4 [1] @ git status
interactive rebase in progress; onto 55982565e
Last commands done (141 commands done):
   pick bbe7b64f4 Add some tests for Mingw32CCompiler class
   merge -C 5fb38a1e169dd17103b1abe9282d3dae5f049a9a main-6 # Merge branch 'main' into add-mingw-support
  (see more in file .git/rebase-merge/done)
Next commands to do (22 remaining commands):
   pick a100e3b41 CI: run pytest without arguments to avoid stdlib distutils being imported
   pick 5bdd6d3e3 CI: explicitely CC/CXX for clang only mingw environments
  (use "git rebase --edit-todo" to view and edit)

You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:
        modified:   .coveragerc
        modified:   .github/workflows/main.yml
        modified:   .readthedocs.yaml
        modified:   README.rst
        modified:   conftest.py
        modified:   distutils/__init__.py
        modified:   distutils/_collections.py
        new file:   distutils/_itertools.py
        modified:   distutils/_log.py
        modified:   distutils/_macos_compat.py
        modified:   distutils/_modified.py
        modified:   distutils/_msvccompiler.py
        new file:   distutils/_vendor/__init__.py
        new file:   distutils/_vendor/packaging-24.0.dist-info/INSTALLER
        new file:   distutils/_vendor/packaging-24.0.dist-info/LICENSE
        new file:   distutils/_vendor/packaging-24.0.dist-info/LICENSE.APACHE
        new file:   distutils/_vendor/packaging-24.0.dist-info/LICENSE.BSD
        new file:   distutils/_vendor/packaging-24.0.dist-info/METADATA
        new file:   distutils/_vendor/packaging-24.0.dist-info/RECORD
        new file:   distutils/_vendor/packaging-24.0.dist-info/REQUESTED
        new file:   distutils/_vendor/packaging-24.0.dist-info/WHEEL
        new file:   distutils/_vendor/packaging/__init__.py
        new file:   distutils/_vendor/packaging/_elffile.py
        new file:   distutils/_vendor/packaging/_manylinux.py
        new file:   distutils/_vendor/packaging/_musllinux.py
        new file:   distutils/_vendor/packaging/_parser.py
        new file:   distutils/_vendor/packaging/_structures.py
        new file:   distutils/_vendor/packaging/_tokenizer.py
        new file:   distutils/_vendor/packaging/markers.py
        new file:   distutils/_vendor/packaging/metadata.py
        new file:   distutils/_vendor/packaging/py.typed
        new file:   distutils/_vendor/packaging/requirements.py
        new file:   distutils/_vendor/packaging/specifiers.py
        new file:   distutils/_vendor/packaging/tags.py
        new file:   distutils/_vendor/packaging/utils.py
        new file:   distutils/_vendor/packaging/version.py
        new file:   distutils/_vendor/ruff.toml
        modified:   distutils/archive_util.py
        modified:   distutils/bcppcompiler.py
        modified:   distutils/ccompiler.py
        modified:   distutils/cmd.py
        modified:   distutils/command/__init__.py
        modified:   distutils/command/_framework_compat.py
        modified:   distutils/command/bdist.py
        modified:   distutils/command/bdist_dumb.py
        modified:   distutils/command/bdist_rpm.py
        modified:   distutils/command/build.py
        modified:   distutils/command/build_clib.py
        modified:   distutils/command/build_ext.py
        modified:   distutils/command/build_py.py
        modified:   distutils/command/build_scripts.py
        modified:   distutils/command/check.py
        modified:   distutils/command/clean.py
        modified:   distutils/command/config.py
        modified:   distutils/command/install.py
        modified:   distutils/command/install_data.py
        modified:   distutils/command/install_egg_info.py
        modified:   distutils/command/install_headers.py
        modified:   distutils/command/install_lib.py
        modified:   distutils/command/install_scripts.py
        deleted:    distutils/command/py37compat.py
        modified:   distutils/command/register.py
        modified:   distutils/command/sdist.py
        modified:   distutils/command/upload.py
        new file:   distutils/compat/__init__.py
        new file:   distutils/compat/py38.py
        renamed:    distutils/py39compat.py -> distutils/compat/py39.py
        modified:   distutils/config.py
        modified:   distutils/core.py
        modified:   distutils/cygwinccompiler.py
        modified:   distutils/dir_util.py
        modified:   distutils/dist.py
        modified:   distutils/extension.py
        modified:   distutils/fancy_getopt.py
        modified:   distutils/file_util.py
        modified:   distutils/filelist.py
        modified:   distutils/log.py
        modified:   distutils/msvc9compiler.py
        modified:   distutils/msvccompiler.py
        deleted:    distutils/py38compat.py
        modified:   distutils/spawn.py
        modified:   distutils/sysconfig.py
        modified:   distutils/tests/__init__.py
        new file:   distutils/tests/compat/__init__.py
        renamed:    distutils/tests/py38compat.py -> distutils/tests/compat/py38.py
        deleted:    distutils/tests/py37compat.py
        modified:   distutils/tests/support.py
        modified:   distutils/tests/test_archive_util.py
        modified:   distutils/tests/test_bdist.py
        modified:   distutils/tests/test_bdist_dumb.py
        modified:   distutils/tests/test_bdist_rpm.py
        modified:   distutils/tests/test_build.py
        modified:   distutils/tests/test_build_clib.py
        modified:   distutils/tests/test_build_ext.py
        modified:   distutils/tests/test_build_py.py
        modified:   distutils/tests/test_build_scripts.py
        modified:   distutils/tests/test_ccompiler.py
        modified:   distutils/tests/test_check.py
        modified:   distutils/tests/test_clean.py
        modified:   distutils/tests/test_cmd.py
        modified:   distutils/tests/test_config.py
        modified:   distutils/tests/test_config_cmd.py
        modified:   distutils/tests/test_core.py
        modified:   distutils/tests/test_cygwinccompiler.py
        modified:   distutils/tests/test_dir_util.py
        modified:   distutils/tests/test_dist.py
        modified:   distutils/tests/test_extension.py
        modified:   distutils/tests/test_file_util.py
        modified:   distutils/tests/test_filelist.py
        modified:   distutils/tests/test_install.py
        modified:   distutils/tests/test_install_data.py
        modified:   distutils/tests/test_install_headers.py
        modified:   distutils/tests/test_install_lib.py
        modified:   distutils/tests/test_install_scripts.py
        modified:   distutils/tests/test_log.py
        modified:   distutils/tests/test_modified.py
        modified:   distutils/tests/test_msvc9compiler.py
        modified:   distutils/tests/test_msvccompiler.py
        modified:   distutils/tests/test_register.py
        modified:   distutils/tests/test_sdist.py
        modified:   distutils/tests/test_spawn.py
        modified:   distutils/tests/test_sysconfig.py
        modified:   distutils/tests/test_text_file.py
        modified:   distutils/tests/test_unixccompiler.py
        modified:   distutils/tests/test_upload.py
        modified:   distutils/tests/test_util.py
        modified:   distutils/tests/test_version.py
        modified:   distutils/tests/unix_compat.py
        modified:   distutils/text_file.py
        modified:   distutils/unixccompiler.py
        modified:   distutils/util.py
        modified:   distutils/version.py
        modified:   distutils/versionpredicate.py
        new file:   distutils/zosccompiler.py
        modified:   docs/distutils/apiref.rst
        modified:   docs/distutils/configfile.rst
        modified:   docs/distutils/examples.rst
        modified:   docs/distutils/setupscript.rst
        modified:   pyproject.toml
        modified:   pytest.ini
        modified:   ruff.toml
        modified:   tox.ini

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
        deleted by them: setup.cfg

 distutils bbe7b64f4 @ cat setup.cfg
[metadata]
name = distutils
author = Jason R. Coombs
author_email = [email protected]
description = Distribution utilities formerly from standard library
long_description = file:README.rst
url = https://github.com/pypa/distutils
classifiers =
        Development Status :: 5 - Production/Stable
        Intended Audience :: Developers
        License :: OSI Approved :: MIT License
        Programming Language :: Python :: 3
        Programming Language :: Python :: 3 :: Only

[options]
packages = find_namespace:
include_package_data = true
python_requires = >=3.8
install_requires =

[options.packages.find]
exclude =
        docs*
        tests*

[options.extras_require]
testing =
        # upstream
        pytest >= 6
        pytest-checkdocs >= 2.4
        pytest-cov
        # disabled
        #pytest-mypy; \
        #       # workaround for jaraco/skeleton#22
        #       python_implementation != "PyPy"
        pytest-enabler >= 2.2
        pytest-ruff >= 0.2.1

        # local
        pytest >= 7.4.3  #186
        jaraco.envs>=2.4
        jaraco.path
        path
        docutils
        pyfakefs
        more_itertools

docs =
        # upstream
        sphinx >= 3.5
        # workaround for sphinx/sphinx-doc#11662
        sphinx < 7.2.5
        jaraco.packaging >= 9.3
        rst.linker >= 1.9
        furo
        sphinx-lint

        # local

[options.entry_points]
 distutils bbe7b64f4 @ git rm setup.cfg
rm 'setup.cfg'
 distutils bbe7b64f4 @ git rebase --continue
[detached HEAD 066ef49b5] Merge branch 'main' into add-mingw-support
Auto-merging distutils/ccompiler.py
Auto-merging distutils/command/bdist_dumb.py
Auto-merging distutils/command/bdist_rpm.py
Auto-merging distutils/command/build.py
Auto-merging distutils/command/build_ext.py
Auto-merging distutils/command/install.py
Auto-merging distutils/command/register.py
Auto-merging distutils/dist.py
Auto-merging distutils/fancy_getopt.py
[detached HEAD 7a9818b5d] Merge pull request pypa/distutils#255 from DimitriPapadopoulos/ISC
 Date: Thu Jun 27 05:59:14 2024 -0400
Auto-merging distutils/ccompiler.py
Auto-merging distutils/command/build_ext.py
[detached HEAD b2660613e] Merge pull request pypa/distutils#184 from msys2-contrib/add-mingw-support
 Date: Fri Jun 28 08:34:35 2024 -0400
Auto-merging distutils/command/build_ext.py
[detached HEAD 4a742fc8a] Merge pull request pypa/distutils#262 from DimitriPapadopoulos/default
 Date: Fri Jun 28 08:37:01 2024 -0400
Auto-merging distutils/unixccompiler.py
Successfully rebased and updated refs/heads/main.
 distutils main @ git diff origin/main
 distutils main @