From d6b7d47430d97669b6554063feef30ffc532302d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 31 Oct 2023 10:56:35 +0000 Subject: [PATCH] GitPython is no longer a base dependency for Windows and MacOS. The plan is to make pygit2 the base dependency before 3007.0 comes out. Signed-off-by: Pedro Algarvio --- requirements/base.txt | 3 --- requirements/static/ci/py3.10/darwin.txt | 15 ++++----------- requirements/static/ci/py3.10/windows.txt | 15 ++++----------- requirements/static/ci/py3.11/darwin.txt | 15 ++++----------- requirements/static/ci/py3.11/windows.txt | 15 ++++----------- requirements/static/ci/py3.8/windows.txt | 15 ++++----------- requirements/static/ci/py3.9/darwin.txt | 15 ++++----------- requirements/static/ci/py3.9/windows.txt | 15 ++++----------- requirements/static/pkg/py3.10/darwin.txt | 6 ------ requirements/static/pkg/py3.10/windows.txt | 6 ------ requirements/static/pkg/py3.11/darwin.txt | 6 ------ requirements/static/pkg/py3.11/windows.txt | 6 ------ requirements/static/pkg/py3.8/windows.txt | 6 ------ requirements/static/pkg/py3.9/darwin.txt | 6 ------ requirements/static/pkg/py3.9/windows.txt | 6 ------ 15 files changed, 28 insertions(+), 122 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index ab4c93433fb..feb58338cb5 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -38,6 +38,3 @@ lxml>=4.6.3; sys_platform == 'win32' apache-libcloud>=2.4.0; sys_platform == 'darwin' linode-python>=1.1.1; sys_platform == 'darwin' vultr>=1.0.1; sys_platform == 'darwin' - -# From old windows.txt and darwin.txt requirements file -gitpython>=3.1.35; sys_platform == 'win32' or sys_platform == 'darwin' diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index f884660fae1..47a97e17a72 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -136,14 +136,9 @@ genshi==0.7.7 geomet==0.2.1.post1 # via cassandra-driver gitdb==4.0.10 - # via - # -c requirements/static/ci/../pkg/py3.10/darwin.txt - # gitpython -gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin" - # via - # -c requirements/static/ci/../pkg/py3.10/darwin.txt - # -r requirements/base.txt - # -r requirements/static/ci/common.in + # via gitpython +gitpython==3.1.40 + # via -r requirements/static/ci/common.in google-auth==2.19.1 # via kubernetes hglib==2.6.2 @@ -479,9 +474,7 @@ six==1.16.0 # vcert # websocket-client smmap==5.0.0 - # via - # -c requirements/static/ci/../pkg/py3.10/darwin.txt - # gitdb + # via gitdb sqlparse==0.4.4 # via -r requirements/static/ci/common.in strict-rfc3339==0.7 diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index ff78ef6bae3..3651ed2dca3 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -127,14 +127,9 @@ genshi==0.7.7 geomet==0.2.1.post1 # via cassandra-driver gitdb==4.0.10 - # via - # -c requirements/static/ci/../pkg/py3.10/windows.txt - # gitpython -gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin" - # via - # -c requirements/static/ci/../pkg/py3.10/windows.txt - # -r requirements/base.txt - # -r requirements/static/ci/common.in + # via gitpython +gitpython==3.1.40 + # via -r requirements/static/ci/common.in google-auth==2.19.1 # via kubernetes idna==3.4 @@ -429,9 +424,7 @@ six==1.15.0 # pywinrm # websocket-client smmap==5.0.0 - # via - # -c requirements/static/ci/../pkg/py3.10/windows.txt - # gitdb + # via gitdb sqlparse==0.4.4 # via -r requirements/static/ci/common.in strict-rfc3339==0.7 diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index f4dfd3f8495..6b235bc61e8 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/requirements/static/ci/py3.11/darwin.txt @@ -134,14 +134,9 @@ genshi==0.7.7 geomet==0.2.1.post1 # via cassandra-driver gitdb==4.0.10 - # via - # -c requirements/static/ci/../pkg/py3.11/darwin.txt - # gitpython -gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin" - # via - # -c requirements/static/ci/../pkg/py3.11/darwin.txt - # -r requirements/base.txt - # -r requirements/static/ci/common.in + # via gitpython +gitpython==3.1.40 + # via -r requirements/static/ci/common.in google-auth==2.19.1 # via kubernetes hglib==2.6.2 @@ -477,9 +472,7 @@ six==1.16.0 # vcert # websocket-client smmap==5.0.0 - # via - # -c requirements/static/ci/../pkg/py3.11/darwin.txt - # gitdb + # via gitdb sqlparse==0.4.4 # via -r requirements/static/ci/common.in strict-rfc3339==0.7 diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index 368ed571402..099017171de 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/requirements/static/ci/py3.11/windows.txt @@ -125,14 +125,9 @@ genshi==0.7.7 geomet==0.2.1.post1 # via cassandra-driver gitdb==4.0.10 - # via - # -c requirements/static/ci/../pkg/py3.11/windows.txt - # gitpython -gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin" - # via - # -c requirements/static/ci/../pkg/py3.11/windows.txt - # -r requirements/base.txt - # -r requirements/static/ci/common.in + # via gitpython +gitpython==3.1.40 + # via -r requirements/static/ci/common.in google-auth==2.19.1 # via kubernetes idna==3.4 @@ -427,9 +422,7 @@ six==1.15.0 # pywinrm # websocket-client smmap==5.0.0 - # via - # -c requirements/static/ci/../pkg/py3.11/windows.txt - # gitdb + # via gitdb sqlparse==0.4.4 # via -r requirements/static/ci/common.in strict-rfc3339==0.7 diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt index b3c8438642a..d24ec5d3135 100644 --- a/requirements/static/ci/py3.8/windows.txt +++ b/requirements/static/ci/py3.8/windows.txt @@ -127,14 +127,9 @@ genshi==0.7.7 geomet==0.2.1.post1 # via cassandra-driver gitdb==4.0.10 - # via - # -c requirements/static/ci/../pkg/py3.8/windows.txt - # gitpython -gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin" - # via - # -c requirements/static/ci/../pkg/py3.8/windows.txt - # -r requirements/base.txt - # -r requirements/static/ci/common.in + # via gitpython +gitpython==3.1.40 + # via -r requirements/static/ci/common.in google-auth==2.19.1 # via kubernetes idna==3.4 @@ -434,9 +429,7 @@ six==1.15.0 # pywinrm # websocket-client smmap==5.0.0 - # via - # -c requirements/static/ci/../pkg/py3.8/windows.txt - # gitdb + # via gitdb sqlparse==0.4.4 # via -r requirements/static/ci/common.in strict-rfc3339==0.7 diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index f82d6df764d..09e575a60bf 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -136,14 +136,9 @@ genshi==0.7.7 geomet==0.2.1.post1 # via cassandra-driver gitdb==4.0.10 - # via - # -c requirements/static/ci/../pkg/py3.9/darwin.txt - # gitpython -gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin" - # via - # -c requirements/static/ci/../pkg/py3.9/darwin.txt - # -r requirements/base.txt - # -r requirements/static/ci/common.in + # via gitpython +gitpython==3.1.40 + # via -r requirements/static/ci/common.in google-auth==2.19.1 # via kubernetes hglib==2.6.2 @@ -479,9 +474,7 @@ six==1.16.0 # vcert # websocket-client smmap==5.0.0 - # via - # -c requirements/static/ci/../pkg/py3.9/darwin.txt - # gitdb + # via gitdb sqlparse==0.4.4 # via -r requirements/static/ci/common.in strict-rfc3339==0.7 diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index bffecdb853f..393205d4ef4 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -127,14 +127,9 @@ genshi==0.7.7 geomet==0.2.1.post1 # via cassandra-driver gitdb==4.0.10 - # via - # -c requirements/static/ci/../pkg/py3.9/windows.txt - # gitpython -gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin" - # via - # -c requirements/static/ci/../pkg/py3.9/windows.txt - # -r requirements/base.txt - # -r requirements/static/ci/common.in + # via gitpython +gitpython==3.1.40 + # via -r requirements/static/ci/common.in google-auth==2.19.1 # via kubernetes idna==3.4 @@ -430,9 +425,7 @@ six==1.15.0 # pywinrm # websocket-client smmap==5.0.0 - # via - # -c requirements/static/ci/../pkg/py3.9/windows.txt - # gitdb + # via gitdb sqlparse==0.4.4 # via -r requirements/static/ci/common.in strict-rfc3339==0.7 diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index 977290a6e9c..8e818502f62 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/requirements/static/pkg/py3.10/darwin.txt @@ -26,10 +26,6 @@ cryptography==41.0.4 # pyopenssl distro==1.8.0 # via -r requirements/base.txt -gitdb==4.0.10 - # via gitpython -gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin" - # via -r requirements/base.txt idna==3.4 # via requests immutables==0.15 @@ -102,8 +98,6 @@ setproctitle==1.3.2 # via -r requirements/base.txt six==1.16.0 # via python-dateutil -smmap==5.0.0 - # via gitdb tempora==5.3.0 # via portend timelib==0.3.0 diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt index 111b15b9e95..a408b56dfa4 100644 --- a/requirements/static/pkg/py3.10/windows.txt +++ b/requirements/static/pkg/py3.10/windows.txt @@ -28,10 +28,6 @@ cryptography==41.0.4 # pyopenssl distro==1.8.0 # via -r requirements/base.txt -gitdb==4.0.10 - # via gitpython -gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin" - # via -r requirements/base.txt idna==3.4 # via requests immutables==0.15 @@ -111,8 +107,6 @@ setproctitle==1.3.2 # via -r requirements/base.txt six==1.15.0 # via python-dateutil -smmap==5.0.0 - # via gitdb tempora==5.3.0 # via portend timelib==0.3.0 diff --git a/requirements/static/pkg/py3.11/darwin.txt b/requirements/static/pkg/py3.11/darwin.txt index 7c4054c39ee..acb725dfa8a 100644 --- a/requirements/static/pkg/py3.11/darwin.txt +++ b/requirements/static/pkg/py3.11/darwin.txt @@ -26,10 +26,6 @@ cryptography==41.0.4 # pyopenssl distro==1.8.0 # via -r requirements/base.txt -gitdb==4.0.10 - # via gitpython -gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin" - # via -r requirements/base.txt idna==3.4 # via requests immutables==0.15 @@ -102,8 +98,6 @@ setproctitle==1.3.2 # via -r requirements/base.txt six==1.16.0 # via python-dateutil -smmap==5.0.0 - # via gitdb tempora==5.3.0 # via portend timelib==0.3.0 diff --git a/requirements/static/pkg/py3.11/windows.txt b/requirements/static/pkg/py3.11/windows.txt index 770650d3a33..2940d3f32cb 100644 --- a/requirements/static/pkg/py3.11/windows.txt +++ b/requirements/static/pkg/py3.11/windows.txt @@ -28,10 +28,6 @@ cryptography==41.0.4 # pyopenssl distro==1.8.0 # via -r requirements/base.txt -gitdb==4.0.10 - # via gitpython -gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin" - # via -r requirements/base.txt idna==3.4 # via requests immutables==0.15 @@ -111,8 +107,6 @@ setproctitle==1.3.2 # via -r requirements/base.txt six==1.15.0 # via python-dateutil -smmap==5.0.0 - # via gitdb tempora==5.3.0 # via portend timelib==0.3.0 diff --git a/requirements/static/pkg/py3.8/windows.txt b/requirements/static/pkg/py3.8/windows.txt index 1785ac1341c..b0cafc06d43 100644 --- a/requirements/static/pkg/py3.8/windows.txt +++ b/requirements/static/pkg/py3.8/windows.txt @@ -28,10 +28,6 @@ cryptography==41.0.4 # pyopenssl distro==1.8.0 # via -r requirements/base.txt -gitdb==4.0.10 - # via gitpython -gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin" - # via -r requirements/base.txt idna==3.4 # via requests immutables==0.15 @@ -114,8 +110,6 @@ setproctitle==1.3.2 # via -r requirements/base.txt six==1.15.0 # via python-dateutil -smmap==5.0.0 - # via gitdb tempora==5.3.0 # via portend timelib==0.3.0 diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt index 6ffe69f8b07..c3502c5a45f 100644 --- a/requirements/static/pkg/py3.9/darwin.txt +++ b/requirements/static/pkg/py3.9/darwin.txt @@ -26,10 +26,6 @@ cryptography==41.0.4 # pyopenssl distro==1.8.0 # via -r requirements/base.txt -gitdb==4.0.10 - # via gitpython -gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin" - # via -r requirements/base.txt idna==3.4 # via requests immutables==0.15 @@ -102,8 +98,6 @@ setproctitle==1.3.2 # via -r requirements/base.txt six==1.16.0 # via python-dateutil -smmap==5.0.0 - # via gitdb tempora==5.3.0 # via portend timelib==0.3.0 diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt index f478bc1810d..d00f41bfe9e 100644 --- a/requirements/static/pkg/py3.9/windows.txt +++ b/requirements/static/pkg/py3.9/windows.txt @@ -28,10 +28,6 @@ cryptography==41.0.4 # pyopenssl distro==1.8.0 # via -r requirements/base.txt -gitdb==4.0.10 - # via gitpython -gitpython==3.1.40 ; sys_platform == "win32" or sys_platform == "darwin" - # via -r requirements/base.txt idna==3.4 # via requests immutables==0.15 @@ -112,8 +108,6 @@ setproctitle==1.3.2 # via -r requirements/base.txt six==1.15.0 # via python-dateutil -smmap==5.0.0 - # via gitdb tempora==5.3.0 # via portend timelib==0.3.0