From e3ef74d7bd9a31edb724d6b3fe26fcf20cf925df Mon Sep 17 00:00:00 2001 From: Bryan Wilson Date: Mon, 11 Dec 2023 16:04:57 -0800 Subject: [PATCH 1/2] use temp Overhangio fork of py2neo official py2neo is EOL and releases are gone from GitHub and PyPI --- requirements/edx/base.txt | 4 +++- requirements/edx/development.txt | 4 +++- requirements/edx/github.in | 4 +++- requirements/edx/testing.txt | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 17f3e0db2b8..b97f0c28317 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -181,7 +181,9 @@ pillow==7.1.2 # via -r requirements/edx/base.in, edx-enterprise, edx pkgconfig==1.5.1 # via xmlsec polib==1.1.0 # via edx-i18n-tools psutil==1.2.1 # via -r requirements/edx/paver.txt, edx-django-utils --e git+https://github.com/technige/py2neo.git@py2neo-3.1.2#egg=py2neo==3.1.2 # via -r requirements/edx/github.in # via -r requirements/edx/base.in +# modified from https://github.com/openedx/edx-platform/pull/33453 +# for earlier pip version in use on Juniper release +py2neo --find-links https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz pycontracts==1.8.12 # via -r requirements/edx/base.in, edx-user-state-client pycountry==19.8.18 # via -r requirements/edx/base.in pycparser==2.20 # via -r requirements/edx/../edx-sandbox/shared.txt, cffi diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 2da53ef6e01..126301a8d36 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -218,7 +218,9 @@ pkgconfig==1.5.1 # via -r requirements/edx/testing.txt, xmlsec pluggy==0.13.1 # via -r requirements/edx/testing.txt, diff-cover, pytest, tox polib==1.1.0 # via -r requirements/edx/testing.txt, edx-i18n-tools psutil==1.2.1 # via -r requirements/edx/testing.txt, edx-django-utils --e git+https://github.com/technige/py2neo.git@py2neo-3.1.2#egg=py2neo==3.1.2 # via -r requirements/edx/github.in # via -r requirements/edx/testing.txt +# modified from https://github.com/openedx/edx-platform/pull/33453 +# for earlier pip version in use on Juniper release +py2neo --find-links https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz py==1.8.1 # via -r requirements/edx/testing.txt, pytest, tox pycodestyle==2.6.0 # via -r requirements/edx/testing.txt, flake8 pycontracts==1.8.12 # via -r requirements/edx/testing.txt, edx-user-state-client diff --git a/requirements/edx/github.in b/requirements/edx/github.in index a0ae6f9b0ff..80f7b2f2cc9 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -59,7 +59,9 @@ git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2 git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2 -e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme --e git+https://github.com/technige/py2neo.git@py2neo-3.1.2#egg=py2neo==3.1.2 +# modified from https://github.com/openedx/edx-platform/pull/33453 +# for earlier pip version in use on Juniper release +--index-url https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz # The latest 2.0.0 release doesn't yet support Django 2.2, this commit from master does -e git+https://github.com/jsocol/django-ratelimit.git@72edbe8949fbf6699848e5847645a1998f121d46#egg=ratelimit diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 879892db16f..f3e95dd3404 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -209,7 +209,9 @@ pkgconfig==1.5.1 # via -r requirements/edx/base.txt, xmlsec pluggy==0.13.1 # via -r requirements/edx/coverage.txt, diff-cover, pytest, tox polib==1.1.0 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, edx-i18n-tools psutil==1.2.1 # via -r requirements/edx/base.txt, edx-django-utils --e git+https://github.com/technige/py2neo.git@py2neo-3.1.2#egg=py2neo==3.1.2 # via -r requirements/edx/github.in # via -r requirements/edx/base.txt +# modified from https://github.com/openedx/edx-platform/pull/33453 +# for earlier pip version in use on Juniper release +py2neo --find-links https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz py==1.8.1 # via pytest, tox pycodestyle==2.6.0 # via -r requirements/edx/testing.in, flake8 pycontracts==1.8.12 # via -r requirements/edx/base.txt, edx-user-state-client From 8cc191852cf057bcdcde6161505c2ef8f1c8984a Mon Sep 17 00:00:00 2001 From: Bryan Wilson Date: Wed, 13 Dec 2023 20:52:33 -0800 Subject: [PATCH 2/2] use py2neo-history package on PyPI to get older release overhangio fork is too recent --- requirements/edx/base.txt | 4 +--- requirements/edx/development.txt | 4 +--- requirements/edx/github.in | 3 --- requirements/edx/testing.txt | 2 +- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index b97f0c28317..775e61c4ed3 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -181,9 +181,7 @@ pillow==7.1.2 # via -r requirements/edx/base.in, edx-enterprise, edx pkgconfig==1.5.1 # via xmlsec polib==1.1.0 # via edx-i18n-tools psutil==1.2.1 # via -r requirements/edx/paver.txt, edx-django-utils -# modified from https://github.com/openedx/edx-platform/pull/33453 -# for earlier pip version in use on Juniper release -py2neo --find-links https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz +py2neo-history==3.1.2 pycontracts==1.8.12 # via -r requirements/edx/base.in, edx-user-state-client pycountry==19.8.18 # via -r requirements/edx/base.in pycparser==2.20 # via -r requirements/edx/../edx-sandbox/shared.txt, cffi diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 126301a8d36..616984a8598 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -218,9 +218,7 @@ pkgconfig==1.5.1 # via -r requirements/edx/testing.txt, xmlsec pluggy==0.13.1 # via -r requirements/edx/testing.txt, diff-cover, pytest, tox polib==1.1.0 # via -r requirements/edx/testing.txt, edx-i18n-tools psutil==1.2.1 # via -r requirements/edx/testing.txt, edx-django-utils -# modified from https://github.com/openedx/edx-platform/pull/33453 -# for earlier pip version in use on Juniper release -py2neo --find-links https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz +py2neo-history==3.1.2 py==1.8.1 # via -r requirements/edx/testing.txt, pytest, tox pycodestyle==2.6.0 # via -r requirements/edx/testing.txt, flake8 pycontracts==1.8.12 # via -r requirements/edx/testing.txt, edx-user-state-client diff --git a/requirements/edx/github.in b/requirements/edx/github.in index 80f7b2f2cc9..9a8b2966e72 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -59,9 +59,6 @@ git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2 git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2 -e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme -# modified from https://github.com/openedx/edx-platform/pull/33453 -# for earlier pip version in use on Juniper release ---index-url https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz # The latest 2.0.0 release doesn't yet support Django 2.2, this commit from master does -e git+https://github.com/jsocol/django-ratelimit.git@72edbe8949fbf6699848e5847645a1998f121d46#egg=ratelimit diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index f3e95dd3404..ef360465d76 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -211,7 +211,7 @@ polib==1.1.0 # via -r requirements/edx/base.txt, -r requirements/ed psutil==1.2.1 # via -r requirements/edx/base.txt, edx-django-utils # modified from https://github.com/openedx/edx-platform/pull/33453 # for earlier pip version in use on Juniper release -py2neo --find-links https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz +py2neo-history==3.1.2 py==1.8.1 # via pytest, tox pycodestyle==2.6.0 # via -r requirements/edx/testing.in, flake8 pycontracts==1.8.12 # via -r requirements/edx/base.txt, edx-user-state-client