From 96cfe33c5ea12e52c072efc8908dc1d58d590022 Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Tue, 10 Oct 2023 15:10:08 +0500 Subject: [PATCH 1/5] test: test using py2neo fork commit --- requirements/edx/base.txt | 6 ++---- requirements/edx/development.txt | 9 ++++----- requirements/edx/doc.txt | 6 ++---- requirements/edx/github.in | 5 +++++ requirements/edx/testing.txt | 6 ++---- 5 files changed, 15 insertions(+), 17 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 656523e46680..6c43d2b9ea59 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -6,6 +6,8 @@ # -e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack # via -r requirements/edx/github.in +-e git+https://github.com/UsamaSadiq/py2neo.git@7f57cbe1797945ce27e93cfd6ee5dfa291129be5#egg=py2neo + # via -r requirements/edx/github.in acid-xblock==0.2.1 # via -r requirements/edx/kernel.in aiohttp==3.8.6 @@ -845,10 +847,6 @@ psutil==5.9.5 # via # -r requirements/edx/paver.txt # edx-django-utils -py2neo==2021.2.3 - # via - # -c requirements/edx/../constraints.txt - # -r requirements/edx/bundled.in pyasn1==0.5.0 # via pgpy pycountry==22.3.5 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 48b940775f80..488c4b35c458 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -8,6 +8,10 @@ # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt +-e git+https://github.com/UsamaSadiq/py2neo.git@7f57cbe1797945ce27e93cfd6ee5dfa291129be5#egg=py2neo + # via + # -r requirements/edx/doc.txt + # -r requirements/edx/testing.txt accessible-pygments==0.0.4 # via # -r requirements/edx/doc.txt @@ -1445,11 +1449,6 @@ py==1.11.0 # via # -r requirements/edx/testing.txt # tox -py2neo==2021.2.3 - # via - # -c requirements/edx/../constraints.txt - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt pyasn1==0.5.0 # via # -r requirements/edx/doc.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 06e2ac85e4cd..105223fb99ef 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -6,6 +6,8 @@ # -e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack # via -r requirements/edx/base.txt +-e git+https://github.com/UsamaSadiq/py2neo.git@7f57cbe1797945ce27e93cfd6ee5dfa291129be5#egg=py2neo + # via -r requirements/edx/base.txt accessible-pygments==0.0.4 # via pydata-sphinx-theme acid-xblock==0.2.1 @@ -1004,10 +1006,6 @@ psutil==5.9.5 # via # -r requirements/edx/base.txt # edx-django-utils -py2neo==2021.2.3 - # via - # -c requirements/edx/../constraints.txt - # -r requirements/edx/base.txt pyasn1==0.5.0 # via # -r requirements/edx/base.txt diff --git a/requirements/edx/github.in b/requirements/edx/github.in index ea6d47eec8a0..fa10ca03d3fa 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -90,3 +90,8 @@ # django42 support PR merged but new release is pending. # https://github.com/openedx/edx-platform/issues/33431 -e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack + +# official py2neo version has been removed from both GitHub and PyPI +# Using a backup py2neo package for now +# A migration issue will be created to migrate from py2neo to official Neo4j driver +-e git+https://github.com/UsamaSadiq/py2neo.git@7f57cbe1797945ce27e93cfd6ee5dfa291129be5#egg=py2neo diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index ef495fc68911..38a9ac18e9f0 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -6,6 +6,8 @@ # -e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack # via -r requirements/edx/base.txt +-e git+https://github.com/UsamaSadiq/py2neo.git@7f57cbe1797945ce27e93cfd6ee5dfa291129be5#egg=py2neo + # via -r requirements/edx/base.txt acid-xblock==0.2.1 # via -r requirements/edx/base.txt aiohttp==3.8.6 @@ -1084,10 +1086,6 @@ psutil==5.9.5 # pytest-xdist py==1.11.0 # via tox -py2neo==2021.2.3 - # via - # -c requirements/edx/../constraints.txt - # -r requirements/edx/base.txt pyasn1==0.5.0 # via # -r requirements/edx/base.txt From 2aa82096edde2d6f0cff593c64e28f02b28f88db Mon Sep 17 00:00:00 2001 From: edX requirements bot <49161187+edx-requirements-bot@users.noreply.github.com> Date: Tue, 10 Oct 2023 06:39:05 -0400 Subject: [PATCH 2/5] chore: Updating Python Requirements (#33454) --- requirements/edx/base.txt | 5 ++++- requirements/edx/development.txt | 1 + requirements/edx/doc.txt | 4 +++- requirements/edx/testing.txt | 4 +++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 6c43d2b9ea59..2f7fc9732492 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -7,7 +7,10 @@ -e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack # via -r requirements/edx/github.in -e git+https://github.com/UsamaSadiq/py2neo.git@7f57cbe1797945ce27e93cfd6ee5dfa291129be5#egg=py2neo - # via -r requirements/edx/github.in + # via + # -c requirements/edx/../constraints.txt + # -r requirements/edx/bundled.in + # -r requirements/edx/github.in acid-xblock==0.2.1 # via -r requirements/edx/kernel.in aiohttp==3.8.6 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 488c4b35c458..012cddd6a34b 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -10,6 +10,7 @@ # -r requirements/edx/testing.txt -e git+https://github.com/UsamaSadiq/py2neo.git@7f57cbe1797945ce27e93cfd6ee5dfa291129be5#egg=py2neo # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt accessible-pygments==0.0.4 diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 105223fb99ef..7aa574442e3e 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -7,7 +7,9 @@ -e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack # via -r requirements/edx/base.txt -e git+https://github.com/UsamaSadiq/py2neo.git@7f57cbe1797945ce27e93cfd6ee5dfa291129be5#egg=py2neo - # via -r requirements/edx/base.txt + # via + # -c requirements/edx/../constraints.txt + # -r requirements/edx/base.txt accessible-pygments==0.0.4 # via pydata-sphinx-theme acid-xblock==0.2.1 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 38a9ac18e9f0..f179bffd42f8 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -7,7 +7,9 @@ -e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack # via -r requirements/edx/base.txt -e git+https://github.com/UsamaSadiq/py2neo.git@7f57cbe1797945ce27e93cfd6ee5dfa291129be5#egg=py2neo - # via -r requirements/edx/base.txt + # via + # -c requirements/edx/../constraints.txt + # -r requirements/edx/base.txt acid-xblock==0.2.1 # via -r requirements/edx/base.txt aiohttp==3.8.6 From 6130e330c97b1d7d89d3ed46f7d8a1d7a20e5bd0 Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Tue, 10 Oct 2023 15:51:46 +0500 Subject: [PATCH 3/5] docs: add link for the follow up issue to remove fork usage --- requirements/edx/github.in | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/edx/github.in b/requirements/edx/github.in index fa10ca03d3fa..c5ab8343f68a 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -94,4 +94,5 @@ # official py2neo version has been removed from both GitHub and PyPI # Using a backup py2neo package for now # A migration issue will be created to migrate from py2neo to official Neo4j driver +# Follow up issue to remove this fork: https://github.com/openedx/edx-platform/issues/33456 -e git+https://github.com/UsamaSadiq/py2neo.git@7f57cbe1797945ce27e93cfd6ee5dfa291129be5#egg=py2neo From 059c6c3efba8891c646fa62c5881e4b48f58fece Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Tue, 10 Oct 2023 17:36:04 +0500 Subject: [PATCH 4/5] fix: use overhangio py2neo fork --- requirements/edx/bundled.in | 6 +++++- requirements/edx/github.in | 6 ------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/requirements/edx/bundled.in b/requirements/edx/bundled.in index e115f667df2c..b8ada003ca56 100644 --- a/requirements/edx/bundled.in +++ b/requirements/edx/bundled.in @@ -20,7 +20,11 @@ # 4. If the package is not needed in production, add it to another file such # as development.in or testing.in instead. -py2neo # Driver for converting Python modulestore structures to Neo4j's schema (for Coursegraph). +# Driver for converting Python modulestore structures to Neo4j's schema (for Coursegraph). +# Using the fork because official package has been removed from PyPI/GitHub +# Follow up issue to remove this fork: https://github.com/openedx/edx-platform/issues/33456 +https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz + pygments # Used to support colors in paver command output ## Third party integrations diff --git a/requirements/edx/github.in b/requirements/edx/github.in index c5ab8343f68a..ea6d47eec8a0 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -90,9 +90,3 @@ # django42 support PR merged but new release is pending. # https://github.com/openedx/edx-platform/issues/33431 -e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack - -# official py2neo version has been removed from both GitHub and PyPI -# Using a backup py2neo package for now -# A migration issue will be created to migrate from py2neo to official Neo4j driver -# Follow up issue to remove this fork: https://github.com/openedx/edx-platform/issues/33456 --e git+https://github.com/UsamaSadiq/py2neo.git@7f57cbe1797945ce27e93cfd6ee5dfa291129be5#egg=py2neo From 9b143356d365512a006588ecd7e6ea27c79028aa Mon Sep 17 00:00:00 2001 From: edX requirements bot <49161187+edx-requirements-bot@users.noreply.github.com> Date: Tue, 10 Oct 2023 08:43:52 -0400 Subject: [PATCH 5/5] chore: Updating Python Requirements (#33457) --- requirements/edx/base.txt | 9 ++++----- requirements/edx/development.txt | 10 +++++----- requirements/edx/doc.txt | 8 ++++---- requirements/edx/testing.txt | 8 ++++---- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 2f7fc9732492..2438510c2764 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -6,11 +6,6 @@ # -e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack # via -r requirements/edx/github.in --e git+https://github.com/UsamaSadiq/py2neo.git@7f57cbe1797945ce27e93cfd6ee5dfa291129be5#egg=py2neo - # via - # -c requirements/edx/../constraints.txt - # -r requirements/edx/bundled.in - # -r requirements/edx/github.in acid-xblock==0.2.1 # via -r requirements/edx/kernel.in aiohttp==3.8.6 @@ -850,6 +845,10 @@ psutil==5.9.5 # via # -r requirements/edx/paver.txt # edx-django-utils +py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz + # via + # -c requirements/edx/../constraints.txt + # -r requirements/edx/bundled.in pyasn1==0.5.0 # via pgpy pycountry==22.3.5 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 012cddd6a34b..95c68b314c75 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -8,11 +8,6 @@ # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt --e git+https://github.com/UsamaSadiq/py2neo.git@7f57cbe1797945ce27e93cfd6ee5dfa291129be5#egg=py2neo - # via - # -c requirements/edx/../constraints.txt - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt accessible-pygments==0.0.4 # via # -r requirements/edx/doc.txt @@ -1450,6 +1445,11 @@ py==1.11.0 # via # -r requirements/edx/testing.txt # tox +py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz + # via + # -c requirements/edx/../constraints.txt + # -r requirements/edx/doc.txt + # -r requirements/edx/testing.txt pyasn1==0.5.0 # via # -r requirements/edx/doc.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 7aa574442e3e..daf088184cf9 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -6,10 +6,6 @@ # -e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack # via -r requirements/edx/base.txt --e git+https://github.com/UsamaSadiq/py2neo.git@7f57cbe1797945ce27e93cfd6ee5dfa291129be5#egg=py2neo - # via - # -c requirements/edx/../constraints.txt - # -r requirements/edx/base.txt accessible-pygments==0.0.4 # via pydata-sphinx-theme acid-xblock==0.2.1 @@ -1008,6 +1004,10 @@ psutil==5.9.5 # via # -r requirements/edx/base.txt # edx-django-utils +py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz + # via + # -c requirements/edx/../constraints.txt + # -r requirements/edx/base.txt pyasn1==0.5.0 # via # -r requirements/edx/base.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index f179bffd42f8..a728884e70d5 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -6,10 +6,6 @@ # -e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack # via -r requirements/edx/base.txt --e git+https://github.com/UsamaSadiq/py2neo.git@7f57cbe1797945ce27e93cfd6ee5dfa291129be5#egg=py2neo - # via - # -c requirements/edx/../constraints.txt - # -r requirements/edx/base.txt acid-xblock==0.2.1 # via -r requirements/edx/base.txt aiohttp==3.8.6 @@ -1088,6 +1084,10 @@ psutil==5.9.5 # pytest-xdist py==1.11.0 # via tox +py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz + # via + # -c requirements/edx/../constraints.txt + # -r requirements/edx/base.txt pyasn1==0.5.0 # via # -r requirements/edx/base.txt