From 3684c083f22426f19dd8f04e7a168ce73bd25666 Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Wed, 21 Jan 2015 11:41:54 -0500 Subject: [PATCH 1/2] Update pytz to 2015.2 pytz changed their versioning scheme from using letters to using numbers. The old scheme is screwing up new versions of pip. --- docs/shared/requirements.txt | 2 +- requirements/edx/base.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/shared/requirements.txt b/docs/shared/requirements.txt index 842abdd2b3..0eb1869d56 100644 --- a/docs/shared/requirements.txt +++ b/docs/shared/requirements.txt @@ -51,7 +51,7 @@ pygments==1.5 pymongo==2.4.1 python-memcached==1.48 python-openid==2.2.5 -pytz==2012h +pytz==2015.2 PyYAML==3.10 requests==2.3.0 Shapely==1.2.16 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 4656174ec2..b553046070 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -69,7 +69,7 @@ python-memcached==1.48 python-openid==2.2.5 python-dateutil==2.1 python-social-auth==0.1.23 -pytz==2012h +pytz==2015.2 pysrt==0.4.7 PyYAML==3.10 requests==2.3.0 From 22804e41997b189fb63c216fd857853d1addee88 Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Wed, 21 Jan 2015 11:47:53 -0500 Subject: [PATCH 2/2] Use pytz-compatible versions of ora2 and ease --- requirements/edx/github.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index e9ebc3a8f2..c45f6b79a6 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -35,10 +35,10 @@ git+https://github.com/pmitros/pyfs.git@96e1922348bfe6d99201b9512a9ed946c87b7e0b -e git+https://github.com/edx/bok-choy.git@82d2f4b72e807b10d112179c0a4abd810a001b82#egg=bok_choy -e git+https://github.com/edx-solutions/django-splash.git@7579d052afcf474ece1239153cffe1c89935bc4f#egg=django-splash -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock --e git+https://github.com/edx/edx-ora2.git@release-2015-04-15T15.17#egg=edx-ora2 +-e git+https://github.com/edx/edx-ora2.git@release-2015-04-29T15.45#egg=edx-ora2 -e git+https://github.com/edx/edx-submissions.git@8fb070d2a3087dd7656d27022e550d12e3b85ba3#egg=edx-submissions -e git+https://github.com/edx/opaque-keys.git@1254ed4d615a428591850656f39f26509b86d30a#egg=opaque-keys --e git+https://github.com/edx/ease.git@97de68448e5495385ba043d3091f570a699d5b5f#egg=ease +-e git+https://github.com/edx/ease.git@c6dee053eae6b3ac4fdf6be11fa7a9f8265540aa#egg=ease -e git+https://github.com/edx/i18n-tools.git@7b89d5e01c1a7cc5d69d813bd8c6b706a8f75119#egg=i18n-tools -e git+https://github.com/edx/edx-oauth2-provider.git@0.5.1#egg=oauth2-provider -e git+https://github.com/edx/edx-val.git@d6087908aa3dd05ceaa7f56a21284f86c53cb3f0#egg=edx-val