jaraco

 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'

jaraco

When rebasing a merge in git, is there a way to re-use an existing conflict resolution?
Show drafts

Yes, there are a few ways to reuse existing conflict resolutions when rebasing a merge in Git:

1. Rerere (Reuse Recorded Resolution):

    Git has a built-in mechanism called "rerere" (reuse recorded resolution) that can automatically reuse previously resolved conflicts.
    Enable it with git config --global rerere.enabled true.
    When you encounter a conflict that you've already resolved before, Git will attempt to apply the same resolution.

jaraco

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

jaraco

 ~ @# xpip install -U --force-reinstall git+https://github.com/xonsh/xonsh@executables
Collecting git+https://github.com/xonsh/xonsh@executables
  Cloning https://github.com/xonsh/xonsh (to revision executables) to c:\users\jaraco\appdata\local\temp\pip-req-build-sgylurfx
  Running command git clone --filter=blob:none --quiet https://github.com/xonsh/xonsh 'C:\Users\jaraco\AppData\Local\Temp\pip-req-build-sgylurfx'
  Running command git checkout -b executables --track origin/executables
  branch 'executables' set up to track 'origin/executables'.
  Switched to a new branch 'executables'
  Resolved https://github.com/xonsh/xonsh to commit 17638c766e8d288540d202c8e99992a0989d2ce4
  Installing build dependencies ... done
  Getting requirements to build wheel ... done

jaraco

diff --git a/pyproject.toml b/pyproject.toml
index 8434a08..b067201 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -39,7 +39,6 @@ dependencies = [
 	"keyring >= 15.1",
 	"rfc3986 >= 1.4.0",
 	"rich >= 12.0.0",
-	"packaging",
 ]

jaraco

diff --git a/twine/package.py b/twine/package.py
index 99a826a..5e0d87e 100644
--- a/twine/package.py
+++ b/twine/package.py
@@ -134,22 +134,11 @@ class PackageFile:
                 "Make sure the distribution is using a supported Metadata-Version: "
                 f"{', '.join(supported_metadata)}."
             )
-        # If pkginfo <1.11 encounters a metadata version it doesn't support, it may give
-        # back empty metadata. At the very least, we should have a name and version,

jaraco

diff --git a/twine/package.py b/twine/package.py
index 0845105..9361ba9 100644
--- a/twine/package.py
+++ b/twine/package.py
@@ -18,6 +18,7 @@ import logging
 import os
 import re
 import subprocess
+import typing
 import warnings

jaraco

 ~ @ pip-run pytz -- -q
>>> import pytz
>>> import datetime
>>> est = pytz.timezone('US/Eastern')
>>> datetime.datetime(2018, 3, 11, 9, 0, 0).replace(tzinfo=est) - datetime.datetime(2018, 3, 10, 9, 0, 0).replace(tzinfo=est)
datetime.timedelta(days=1)
>>> est.localize(datetime.datetime(2018, 3, 11, 9, 0, 0)) - est.localize(datetime.datetime(2018, 3, 10, 9, 0, 0))
datetime.timedelta(seconds=82800)

jaraco

 ~ @ pip-run pytz -- -q
>>> import pytz
>>> import datetime
>>> est = pytz.timezone('US/Eastern')
>>> datetime.datetime(2018, 3, 11, 9, 0, 0, tzinfo=est) - datetime.datetime(2018, 3, 10, 9, 0, 0, tzinfo=est)
datetime.timedelta(days=1)
>>> est.localize(datetime.datetime(2018, 3, 11, 9, 0, 0)) - est.localize(datetime.datetime(2018, 3, 10, 9, 0, 0))
datetime.timedelta(seconds=82800)

jaraco

 jaraco.docker main @ pip-run mccabe -- -m mccabe jaraco/docker/__init__.py
9:0: 'text_in_file' 1
29:0: 'is_docker' 1
 jaraco.docker main @ git diff
diff --git a/jaraco/docker/__init__.py b/jaraco/docker/__init__.py
index 52bfb1c..1705c44 100644
--- a/jaraco/docker/__init__.py
+++ b/jaraco/docker/__init__.py
@@ -1,15 +1,11 @@
 from __future__ import annotations