Skip to content

Instantly share code, notes, and snippets.

@jaraco
Last active June 28, 2024 16:32
Show Gist options
  • Save jaraco/3bcecc1d2685a4f93ae7f92fc196027f to your computer and use it in GitHub Desktop.
Save jaraco/3bcecc1d2685a4f93ae7f92fc196027f to your computer and use it in GitHub Desktop.
label onto
# Branch DimitriPapadopoulos-FURB
reset onto
pick ea55396cc Apply ruff/refurb rule (FURB105)
pick 0d6794fdc Apply ruff/refurb rule (FURB129)
pick bfadc24bc Apply ruff/refurb rule (FURB142)
pick ec303d596 Apply ruff/refurb rule (FURB140)
pick 8b9f35e00 Construct the set in one expression.
label DimitriPapadopoulos-FURB
# Branch pypa-hotfix-246-linker-args-list
reset onto
merge -c 678e38a3c DimitriPapadopoulos-FURB # Merge pull request #245 from DimitriPapadopoulos/FURB
pick a04913a51 Add type declaration for runtime_library_dir_option, making explicit the different return types one might expect.
label branch-point
pick d2581bf30 Add 'consolidate_linker_args' wrapper to protect the old behavior for now.
pick 98eee7f74 Exclude compat package from coverage.
pick ef297f261 Extend the retention of the compatibility.
label pypa-hotfix-246-linker-args-list
# Branch DimitriPapadopoulos-extra-pairs-of-quotes
reset onto
pick b81e1a5c2 Remove extra pairs of quotes from litteral strings
label DimitriPapadopoulos-extra-pairs-of-quotes
# Branch Merge-https-github-com-jaraco-skeleton
reset 34ba6b2ec # Add link to blog entry from jaraco/skeleton#115 above CI build matrix.
pick 7ad4f2fa9 Pin against pytest 8.1.x due to pytest-dev/pytest#12194.
pick f4529af6a Move project metadata to `pyproject.toml` (jaraco/skeleton#122)
label Merge-https-github-com-jaraco-skeleton
# Branch Merge-https-github-com-jaraco-skeleton-2
reset Merge-https-github-com-jaraco-skeleton # Move project metadata to `pyproject.toml` (jaraco/skeleton#122)
pick 744cf2a2b Allow macos on Python 3.8 to fail as GitHub CI has dropped support.
pick bcf8f079e Move project.urls to appear in the order that ini2toml generates it. Remove project.scripts.
label Merge-https-github-com-jaraco-skeleton-2
# Branch Merge-https-github-com-jaraco-skeleton-3
reset Merge-https-github-com-jaraco-skeleton-2 # Move project.urls to appear in the order that ini2toml generates it. Remove project.scripts.
pick 67aab1554 Revert "Allow macos on Python 3.8 to fail as GitHub CI has dropped support."
pick a595a0fad Rename extras to align with core metadata spec.
label Merge-https-github-com-jaraco-skeleton-3
# Branch Merge-https-github-com-jaraco-skeleton-4
reset Merge-https-github-com-jaraco-skeleton-3 # Rename extras to align with core metadata spec.
pick c9729e1a0 Prefer "Source" to "Homepage" for the repository label.
label Merge-https-github-com-jaraco-skeleton-4
# Branch brenns10-main
reset branch-point # Add type declaration for runtime_library_dir_option, making explicit the different return types one might expect.
merge -c e5e3cc102 pypa-hotfix-246-linker-args-list # Merge pull request #247 from pypa/hotfix/246-linker-args-list
merge -c 53c82a2ab DimitriPapadopoulos-extra-pairs-of-quotes # Merge pull request #239 from DimitriPapadopoulos/extra_pairs_of_quotes
pick 7a6f42b3e 👹 Feed the hobgoblins (delint).
pick a99614885 Move compatibility modules into compat package.
pick b164d6637 Move compatibility module into compat package.
pick 89522f974 Fix return type to match implementation.
pick c6b23d017 🧎‍♀️ Genuflect to the types.
pick e5268b516 Oops. Meant 2025.
pick 6c1cb0885 Migrated config to pyproject.toml using jaraco.develop.migrate-config and ini2toml.
merge -C 851e71af1 Merge-https-github-com-jaraco-skeleton # Merge https://github.com/jaraco/skeleton
pick 7dcde5e3c Extract _make_executable for TestSpawn.
pick 041c42e7e Move and reword comment for brevity and clarity.
pick b07b4edd7 Remove C901 exclusion; code is now compliant.
pick ef8f235a9 Remove apparently unnecessary cast to list.
pick 03f1d85b7 Use proper boolean literals.
pick e85efeebd Replace Popen with check_call.
pick 976e935fa Extract function for _debug wrapper.
pick d6652a4b1 Extract function to inject macos version.
pick 806b1ca68 👹 Feed the hobgoblins (delint).
merge -C e5b06e144 Merge-https-github-com-jaraco-skeleton-2 # Merge https://github.com/jaraco/skeleton
label branch-point-2
pick 4549de129 Use mkstemp unconditionally. mktemp has been deprecated since Python 2.3.
merge -C 294b20642 Merge-https-github-com-jaraco-skeleton-3 # Merge https://github.com/jaraco/skeleton
pick a37185d95 Pin to pytest<8.1.
merge -C 0de29d354 Merge-https-github-com-jaraco-skeleton-4 # Merge https://github.com/jaraco/skeleton
label branch-point-3
pick 6ce37c41a Use a separate build directory for free-threading
label brenns10-main
# Branch pypa-debt-remove-find-executable
reset branch-point-3 # Merge https://github.com/jaraco/skeleton
merge -c e57f6f19a brenns10-main # Merge pull request #260 from brenns10/main
label branch-point-4
pick c9371354c Deprecate find_executable.
label pypa-debt-remove-find-executable
# Branch main
reset branch-point-4 # Merge pull request #260 from brenns10/main
merge -c 076aac25a pypa-debt-remove-find-executable # Merge pull request #250 from pypa/debt/remove-find-executable
label main
# Branch pypa-feature-canonicalize-fullname
reset 9b58da5c8 # Revert "Suppress EncodingWarnings in pyfakefs. Ref pypa/distutils#232. Workaround for pytest-dev/pyfakefs#957."
pick 21482ac4b Support PEP 625
pick 005ba4b6d Expect to find canonicalize_* functions in packaging.
pick be32fecc7 Update tests to match new expectation.
pick 2316432d6 Fix canonicalization
pick d2de2195f In test_sdist, provide a more complex name to capture canonicalization behavior.
pick 11e8f76e4 Add packaging as a vendored package.
pick 96ce7aa3f Use vendored packaging.
pick b26678d5c Revert the canonicalization of the version. Ref pypa/setuptools#3593.
pick c28f347e9 Revert "Update tests to match new expectation."
merge -C dbcb7c852 main # Merge branch 'main' into feature/canonicalize-fullname
pick 57cab7118 Apply canonicalize_version with strip_trailing_zero=False.
label pypa-feature-canonicalize-fullname
# Branch main-2
reset main # Merge pull request #250 from pypa/debt/remove-find-executable
merge -c a1b6cae67 pypa-feature-canonicalize-fullname # Merge pull request #244 from pypa/feature/canonicalize-fullname
label main-2
# Branch DimitriPapadopoulos-RUF100
reset branch-point-2 # Merge https://github.com/jaraco/skeleton
pick 227174d9b Apply ruff rule RUF100
merge -C 1cb6d4dc1 main-2 # Merge branch 'main' into RUF100
pick 5dcc30ff1 Move local ruff rules into a local section.
label DimitriPapadopoulos-RUF100
# Branch main-3
reset main-2 # Merge pull request #244 from pypa/feature/canonicalize-fullname
merge -c e446f2c66 DimitriPapadopoulos-RUF100 # Merge pull request #254 from DimitriPapadopoulos/RUF100
label main-3
# Branch DimitriPapadopoulos-RUF010
reset branch-point-2 # Merge https://github.com/jaraco/skeleton
pick 9bf2d70dc Apply ruff rule RUF010
pick d8d8be78f Enable ruff rule RUF010
merge -C b1f0b008b main-3 # Merge branch 'main' into RUF010
label DimitriPapadopoulos-RUF010
# Branch main-4
reset main-3 # Merge pull request #254 from DimitriPapadopoulos/RUF100
merge -c 15a9ffed6 DimitriPapadopoulos-RUF010 # Merge pull request #257 from DimitriPapadopoulos/RUF010
label main-4
# Branch DimitriPapadopoulos-UP
reset branch-point-2 # Merge https://github.com/jaraco/skeleton
pick 187aeb3d5 Apply ruff/pyupgrade rule UP031
pick 842a559f6 Round of `ruff format` after `ruff check`
pick 4f8294320 Enable ruff/pyupgrade rules (UP)
merge -C 937f7fdac main-4 # Merge branch 'main' into UP
label DimitriPapadopoulos-UP
# Branch Avasam-Use-set-instead-of-True-only-dict
reset branch-point-2 # Merge https://github.com/jaraco/skeleton
pick 797889620 Use `set` instead of `True`-only `dict`
label Avasam-Use-set-instead-of-True-only-dict
# Branch main-5
reset main-4 # Merge pull request #257 from DimitriPapadopoulos/RUF010
merge -c 56d56c0be DimitriPapadopoulos-UP # Merge pull request #256 from DimitriPapadopoulos/UP
merge -c 9b2eb517d Avasam-Use-set-instead-of-True-only-dict # Merge pull request #252 from Avasam/Use-set-instead-of-True-only-dict
label main-5
# Branch Avasam-use-actual-booleans
reset branch-point-2 # Merge https://github.com/jaraco/skeleton
pick 1e1e1b7ff Use actual boolean parameters and variables
merge -C 413150743 main-5 # Merge branch 'main' into use-actual-booleans
label Avasam-use-actual-booleans
# Branch DimitriPapadopoulos-ISC
reset branch-point-2 # Merge https://github.com/jaraco/skeleton
pick 3494fb0dd Apply ruff/flake8-implicit-str-concat rule ISC001
pick b967476b8 Apply ruff/flake8-implicit-str-concat rule ISC003
pick 41f9d80e9 Enable ruff/flake8-implicit-str-concat rules (ISC)
merge -C e67c0fb8d main-5 # Merge branch 'main' into ISC
pick 63d53880d Combine strings for clarity.
label DimitriPapadopoulos-ISC
# Branch main-6
reset main-5 # Merge pull request #252 from Avasam/Use-set-instead-of-True-only-dict
merge -c 32a906db0 Avasam-use-actual-booleans # Merge pull request #253 from Avasam/use-actual-booleans
label main-6
# Branch msys2-contrib-add-mingw-support
reset fb5c57049 # Merge pull request #213 from abravalheri/issue-setuptools-4033
pick 2ad8784df Add support for building extensions using MinGW compilers
pick e69a19e59 Fix tests for `get_msvcr` function
pick 571f761ab Make `test_customize_compiler` run on mingw
pick 9e707f07e CI: add msys2 mingw test
pick 36a2941e5 Fix path separator issue in change_root function
pick c9770264f test_install: fix an issue specific to mingw
pick 79830a816 Remove testing dependency on jaraco.text
pick e4e168705 Add test for dll_libraries attribute in CygwinCCompiler class
pick bbe7b64f4 Add some tests for Mingw32CCompiler class
merge -C 5fb38a1e1 main-6 # Merge branch 'main' into add-mingw-support
pick a100e3b41 CI: run pytest without arguments to avoid stdlib distutils being imported
pick 5bdd6d3e3 CI: explicitely CC/CXX for clang only mingw environments
label msys2-contrib-add-mingw-support
# Branch DimitriPapadopoulos-default
reset main-6 # Merge pull request #253 from Avasam/use-actual-booleans
merge -c efc5dfb31 DimitriPapadopoulos-ISC # Merge pull request #255 from DimitriPapadopoulos/ISC
pick 92c962603 Extract method for checking macro definition.
pick 4fd2d569e Extract method for _is_valid_macro.
label branch-point-5
pick 3764aff62 Use brackets for the default value of option arguments
label DimitriPapadopoulos-default
# Branch main-7
reset branch-point-5 # Extract method for _is_valid_macro.
merge -c 99ca3901d msys2-contrib-add-mingw-support # Merge pull request #184 from msys2-contrib/add-mingw-support
merge -c ec8b191d5 DimitriPapadopoulos-default # Merge pull request #262 from DimitriPapadopoulos/default
pick 3b86c5ea2 Suppress EncodingWarnings in docutils.
label main-7
# Branch DWesl-patch-3
reset 4435cec31 # Merge pull request #205 from fweimer-rh/ccompiler-include
pick b42197ceb Port code from CygwinCCompiler to UnixCCompiler
merge -C 777a43c56 main-7 # Merge branch 'main' into patch-3
pick 8daf3d164 Remove unnecessary override to the same value.
label DWesl-patch-3
reset main-7 # Suppress EncodingWarnings in docutils.
merge -C cfc09f213 DWesl-patch-3 # Merge pull request pypa/distutils#209 from DWesl/patch-3
# Rebase 55982565e..cfc09f213 onto 55982565e (163 commands)
#
# Commands:
# p, pick <commit> = use commit
# r, reword <commit> = use commit, but edit the commit message
# e, edit <commit> = use commit, but stop for amending
# s, squash <commit> = use commit, but meld into previous commit
# f, fixup [-C | -c] <commit> = like "squash" but keep only the previous
# commit's log message, unless -C is used, in which case
# keep only this commit's message; -c is same as -C but
# opens the editor
# x, exec <command> = run command (the rest of the line) using shell
# b, break = stop here (continue rebase later with 'git rebase --continue')
# d, drop <commit> = remove commit
# l, label <label> = label current HEAD with a name
# t, reset <label> = reset HEAD to a label
# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
# create a merge commit using the original merge commit's
# message (or the oneline, if no original merge commit was
# specified); use -c <commit> to reword the commit message
# u, update-ref <ref> = track a placeholder for the <ref> to be updated
# to this position in the new commits. The <ref> is
# updated at the end of the rebase
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment