Skip to content

Commit 42be4ab

Browse files
committed
Bump Python version to 3.6.1 and anticipate dependency issues
1 parent ed60bbd commit 42be4ab

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ COPY ./requirements/ /openedx/edx-platform/requirements
2626
COPY ./common/lib/ /openedx/edx-platform/common/lib/
2727

2828
ENV PATH /opt/pyenv/versions/3.6.1/bin:${PATH}
29-
RUN pip install --trusted-host pypi.python.org setuptools==39.0.1 pip==9.0.3
29+
RUN pip install --trusted-host pypi.python.org "pip==20.3.4" "setuptools<52" "wheel<0.37"
3030

3131
# Install patched version of ora2
3232
RUN pip install --trusted-host pypi.python.org https://github.com/overhangio/edx-ora2/archive/overhangio/boto2to3.zip

requirements/edx/base.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ markey==0.8 # via enmerkar-underscore
155155
markupsafe==1.1.1 # via -r requirements/edx/paver.txt, chem, jinja2, mako, xblock
156156
maxminddb==1.5.4 # via geoip2
157157
mock==3.0.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.txt, xblock-drag-and-drop-v2, xblock-poll
158-
git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2 # via -r requirements/edx/github.in
158+
# git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2 # via -r requirements/edx/github.in
159159
mongoengine==0.20.0 # via -r requirements/edx/base.in
160160
more-itertools==8.4.0 # via -r requirements/edx/paver.txt, zipp
161161
mpmath==1.1.0 # via sympy
@@ -185,7 +185,7 @@ pycryptodomex==3.9.8 # via -r requirements/edx/base.in, edx-proctoring, pyj
185185
pygments==2.6.1 # via -r requirements/edx/base.in
186186
pyjwkest==1.4.2 # via -r requirements/edx/base.in, edx-drf-extensions, lti-consumer-xblock
187187
pyjwt==1.7.1 # via -r requirements/edx/base.in, drf-jwt, edx-rest-api-client, social-auth-core
188-
pymongo==3.10.1 # via -r requirements/edx/base.in, -r requirements/edx/paver.txt, edx-opaque-keys, event-tracking, mongodbproxy, mongoengine
188+
pymongo==3.10.1 # via -r requirements/edx/base.in, -r requirements/edx/paver.txt, edx-opaque-keys, event-tracking, mongoengine
189189
pynliner==0.8.0 # via -r requirements/edx/base.in
190190
pyparsing==2.4.7 # via chem, openedx-calc, packaging, pycontracts
191191
pysrt==1.1.2 # via -r requirements/edx/base.in, edxval

requirements/edx/ci-dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ ipdb==0.12.2
22
ipython==5.8.0
33
pytest==4.1.1
44
django-debug-toolbar==1.8
5-
git+https://github.com/hmarr/django-debug-toolbar-mongo.git@b0686a76f1ce3532088c4aee6e76b9abe61cc808#egg=django-debug-toolbar-mongo==0.1.10
5+
# git+https://github.com/hmarr/django-debug-toolbar-mongo.git@b0686a76f1ce3532088c4aee6e76b9abe61cc808#egg=django-debug-toolbar-mongo==0.1.10

0 commit comments

Comments
 (0)