Skip to content

Commit

Permalink
🐛(hawthorn,ironwood) fix build
Browse files Browse the repository at this point in the history
py2neo repository tags have been removed... but now a package called
py2neo-history has been published on pypi so we use this package to
install the version we need.

Also moto 0.3.1 is no more published on pypi but we can ignore this deps
 as it is a testing one.
  • Loading branch information
jbpenrath committed Mar 14, 2024
1 parent 1570ac9 commit a8a0fcb
Show file tree
Hide file tree
Showing 6 changed files with 94 additions and 12 deletions.
3 changes: 3 additions & 0 deletions releases/hawthorn/1/oee/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,9 @@ COPY patches/* /tmp/
# Patch requirements to install py2neo==3.1.2 from github as this version has been removed from pypi.org
RUN patch -p1 < /tmp/edx-platform_hawthorn.1-oee_requirements-py2neo.patch

# Patch to fix installation of Python modules
RUN patch -p1 < /tmp/edx-platform_hawthorn.1-oee_moto.patch

# Install python dependencies
RUN pip install --src /usr/local/src -r requirements/edx/base.txt && \
pip install -r requirements/edx/extend.txt
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -203,7 +203,7 @@
mock==1.0.1
mongoengine==0.10.0
more-itertools==4.2.0 # via pytest
-moto==0.3.1
+# moto==0.3.1 version not available anymore but we don't need to run the tests anyway
mysql-python==1.2.5
needle==0.5.0 # via bok-choy
networkx==1.7

diff --git a/requirements/edx/testing.in b/requirements/edx/testing.in
--- a/requirements/edx/testing.in
+++ b/requirements/edx/testing.in
@@ -26,7 +26,7 @@
freezegun # Allows tests to mock the output of assorted datetime module functions
httpretty # Library for mocking HTTP requests, used in many tests
isort # For checking and fixing the order of imports
-moto==0.3.1 # Lets tests mock AWS access via the boto library
+# moto==0.3.1 # Version not available anymore but we don't need to run the tests anyway
nose # Former test runner, we're still using some utility functions from it
pa11ycrawler # Python crawler (using Scrapy) that uses Pa11y to check accessibility of pages as it crawls
pycodestyle # Checker for compliance with the Python style guide (PEP 8)

diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -212,7 +212,7 @@
modernize==0.6.1
mongoengine==0.10.0
more-itertools==4.2.0
-moto==0.3.1
+# moto==0.3.1 version not available anymore but we don't need to run the tests anyway
mysql-python==1.2.5
needle==0.5.0
networkx==1.7
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ index f90b796..b5a7d62 100644
polib==1.1.0 # via edx-i18n-tools
psutil==1.2.1
-py2neo==3.1.2
+# install py2neo==3.1.2 from github repository as 3.1.2 has been removed from pypi.org
+git+https://github.com/technige/py2neo@py2neo-3.1.2#egg=py2neo==3.1.2
+# Old versions of py2neo have been moved into a package called py2neo-history
+py2neo-history==3.1.2
pycontracts==1.7.1
pycountry==1.20
pycparser==2.18
Expand All @@ -22,8 +22,8 @@ index 4d69e60..c4662b0 100644
polib==1.1.0
psutil==1.2.1
-py2neo==3.1.2
+# install py2neo==3.1.2 from github repository as 3.1.2 has been removed from pypi.org
+git+https://github.com/technige/py2neo@py2neo-3.1.2#egg=py2neo==3.1.2
+# Old versions of py2neo have been moved into a package called py2neo-history
+py2neo-history==3.1.2
py==1.5.4
pyasn1-modules==0.2.2
pyasn1==0.4.3
Expand All @@ -38,8 +38,8 @@ index 23dd44a..44ed71e 100644
polib==1.1.0
psutil==1.2.1
-py2neo==3.1.2
+# install py2neo==3.1.2 from github repository as 3.1.2 has been removed from pypi.org
+git+https://github.com/technige/py2neo@py2neo-3.1.2#egg=py2neo==3.1.2
+# Old versions of py2neo have been moved into a package called py2neo-history
+py2neo-history==3.1.2
py==1.5.4 # via pytest, tox
pyasn1-modules==0.2.2 # via service-identity
pyasn1==0.4.3 # via pyasn1-modules, service-identity
3 changes: 3 additions & 0 deletions releases/ironwood/2/oee/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,9 @@ COPY patches/* /tmp/
# Patch requirements to install py2neo==3.1.2 from github as this version has been removed from pypi.org
RUN patch -p1 < /tmp/edx-platform_ironwood.2-oee_requirements-py2neo.patch

# Patch to fix installation of Python modules
RUN patch -p1 < /tmp/edx-platform_ironwood.2-oee_moto.patch

# Install python dependencies
RUN pip install --src /usr/local/src -r requirements/edx/base.txt && \
pip install -r requirements/edx/extend.txt
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -205,7 +205,7 @@
mock==1.0.1
mongoengine==0.10.0
more-itertools==5.0.0 # via pytest
-moto==0.3.1
+# moto==0.3.1 version not available anymore but we don't need to run the tests anyway
mysql-python==1.2.5
networkx==1.7
newrelic==4.10.0.112

diff --git a/requirements/edx/testing.in b/requirements/edx/testing.in
--- a/requirements/edx/testing.in
+++ b/requirements/edx/testing.in
@@ -28,7 +28,7 @@
freezegun # Allows tests to mock the output of assorted datetime module functions
httpretty # Library for mocking HTTP requests, used in many tests
isort # For checking and fixing the order of imports
-moto==0.3.1 # Lets tests mock AWS access via the boto library
+# moto==0.3.1 # Version not available anymore but we don't need to run the tests anyway
pa11ycrawler # Python crawler (using Scrapy) that uses Pa11y to check accessibility of pages as it crawls
pycodestyle # Checker for compliance with the Python style guide (PEP 8)
polib # Library for manipulating gettext translation files, used to test paver i18n commands

diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -213,7 +213,7 @@
modernize==0.6.1
mongoengine==0.10.0
more-itertools==5.0.0
-moto==0.3.1
+# moto==0.3.1 version not available anymore but we don't need to run the tests anyway
mysql-python==1.2.5
networkx==1.7
newrelic==4.10.0.112
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ index 8a5f114..338d8a5 100644
polib==1.1.0 # via edx-i18n-tools
psutil==1.2.1
-py2neo==3.1.2
+# install py2neo==3.1.2 from github repository as 3.1.2 has been removed from pypi.org
+git+https://github.com/technige/py2neo@py2neo-3.1.2#egg=py2neo==3.1.2
+# Old versions of py2neo have been moved into a package called py2neo-history
+py2neo-history==3.1.2
pycontracts==1.7.1
pycountry==1.20
pycparser==2.19
Expand All @@ -22,8 +22,8 @@ index 80ac873..cbb87b4 100644
polib==1.1.0
psutil==1.2.1
-py2neo==3.1.2
+# install py2neo==3.1.2 from github repository as 3.1.2 has been removed from pypi.org
+git+https://github.com/technige/py2neo@py2neo-3.1.2#egg=py2neo==3.1.2
+# Old versions of py2neo have been moved into a package called py2neo-history
+py2neo-history==3.1.2
py==1.7.0
pyasn1-modules==0.2.3
pyasn1==0.4.5
Expand All @@ -37,8 +37,8 @@ index 9d55925..0123ad4 100644
polib==1.1.0
psutil==1.2.1
-py2neo==3.1.2
+# install py2neo==3.1.2 from github repository as 3.1.2 has been removed from pypi.org
+git+https://github.com/technige/py2neo@py2neo-3.1.2#egg=py2neo==3.1.2
+# Old versions of py2neo have been moved into a package called py2neo-history
+py2neo-history==3.1.2
py==1.7.0 # via pytest, tox
pyasn1-modules==0.2.3 # via service-identity
pyasn1==0.4.5 # via pyasn1-modules, service-identity

0 comments on commit a8a0fcb

Please sign in to comment.