ID

e4bb7c4

date

2025-05-01 08:21:55+00:00

author

Alex Chan <alex@alexwlchan.net>

parent

febfafd

message

Sort out a conflict with `gitpython`

changed files

3 files, 10 additions, 31 deletions

• git/gm
• git/gp
• requirements.txt

Changed files

git/gm (521) → git/gm (643)

diff --git a/git/gm b/git/gm
index 56de4df..348400e 100755
--- a/git/gm
+++ b/git/gm
@@ -17,7 +17,9 @@ then
   echo ""
 fi
 
-gp
+# This avoids any clashes with other programs called "gp", e.g. at one
+# point I had gitpython in my PATH
+$(dirname "$0")/gp
 
 echo ""
 

git/gp (348) → git/gp (470)

diff --git a/git/gp b/git/gp
index 0b65d5d..91c0046 100755
--- a/git/gp
+++ b/git/gp
@@ -8,7 +8,9 @@ _ensure_ssh_key_loaded
 
 HEAD="$(git rev-parse --abbrev-ref HEAD)"
 
-gf
+# This avoids any clashes with other programs called "gp", e.g. at one
+# point I had gitpython in my PATH
+$(dirname "$0")/gf
 
 echo ""
 

requirements.txt (3799) → requirements.txt (3360)

diff --git a/requirements.txt b/requirements.txt
index 01e9775..0afb120 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,8 +12,6 @@ asgiref==3.8.1
     # via datasette
 attrs==25.3.0
     # via -r requirements.in
-backports-tarfile==1.2.0
-    # via jaraco-context
 beautifulsoup4==4.13.4
     # via -r requirements.in
 boto3==1.38.0
@@ -26,8 +24,6 @@ certifi==2025.1.31
     # via
     #   httpcore
     #   httpx
-cffi==1.17.1
-    # via cryptography
 click==8.1.8
     # via
     #   click-default-group
@@ -41,18 +37,12 @@ click-default-group==1.2.4
     #   sqlite-utils
 cogapp==3.4.1
     # via -r requirements.in
-cryptography==44.0.2
-    # via secretstorage
 datasette==0.65.1
     # via
     #   -r requirements.in
     #   datasette-render-image-tags
 datasette-render-image-tags==0.1
     # via -r requirements.in
-exceptiongroup==1.2.2
-    # via
-    #   anyio
-    #   pytest
 flexcache==0.3
     # via datasette
 flexparser==0.4
@@ -78,8 +68,6 @@ idna==3.10
     #   anyio
     #   httpx
     #   hyperlink
-importlib-metadata==8.6.1
-    # via keyring
 iniconfig==2.1.0
     # via pytest
 itsdangerous==2.2.0
@@ -94,10 +82,6 @@ jaraco-context==6.0.1
     # via keyring
 jaraco-functools==4.1.0
     # via keyring
-jeepney==0.9.0
-    # via
-    #   keyring
-    #   secretstorage
 jinja2==3.1.6
     # via datasette
 jmespath==1.0.1
@@ -126,6 +110,8 @@ pillow==11.2.1
     #   pillow-heif
 pillow-heif==0.22.0
     # via -r requirements.in
+pip==25.1
+    # via datasette
 pipx==1.7.1
     # via -r requirements.in
 platformdirs==4.3.7
@@ -137,8 +123,6 @@ pluggy==1.5.0
     #   datasette
     #   pytest
     #   sqlite-utils
-pycparser==2.22
-    # via cffi
 pygments==2.19.1
     # via -r requirements.in
 pypdf==5.4.0
@@ -157,8 +141,8 @@ ruff==0.11.7
     # via -r requirements.in
 s3transfer==0.12.0
     # via boto3
-secretstorage==3.3.3
-    # via keyring
+setuptools==80.1.0
+    # via datasette
 six==1.17.0
     # via python-dateutil
 sniffio==1.3.1
@@ -173,22 +157,15 @@ tabulate==0.9.0
     # via sqlite-utils
 termcolor==3.0.1
     # via -r requirements.in
-tomli==2.2.1
-    # via
-    #   pipx
-    #   pytest
 tqdm==4.67.1
     # via -r requirements.in
 typing-extensions==4.13.2
     # via
     #   anyio
-    #   asgiref
     #   beautifulsoup4
     #   datasette
     #   flexcache
     #   flexparser
-    #   pypdf
-    #   uvicorn
 urllib3==1.26.20
     # via botocore
 userpath==1.9.2
@@ -197,5 +174,3 @@ uvicorn==0.34.2
     # via datasette
 yt-dlp==2025.3.31
     # via -r requirements.in
-zipp==3.21.0
-    # via importlib-metadata