Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
83cfeb9d
Commit
83cfeb9d
authored
Nov 28, 2016
by
Gregory Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update pytz, update ora-2
parent
205ded99
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
docs/shared/requirements.txt
+1
-1
openedx/core/djangoapps/user_api/tests/test_views.py
+2
-2
requirements/edx/base.txt
+1
-1
requirements/edx/github.txt
+1
-1
No files found.
docs/shared/requirements.txt
View file @
83cfeb9d
...
...
@@ -45,7 +45,7 @@ pygments==1.5
pymongo==2.4.1
python-memcached==1.48
python-openid==2.2.5
pytz==201
5.2
pytz==201
6.7
PyYAML==3.10
requests==2.3.0
Shapely==1.2.16
...
...
openedx/core/djangoapps/user_api/tests/test_views.py
View file @
83cfeb9d
...
...
@@ -2002,8 +2002,8 @@ class CountryTimeZoneListViewTest(UserApiTestCase):
self
.
assertIn
(
time_zone_name
,
common_timezones_set
)
self
.
assertEqual
(
time_zone_info
[
'description'
],
get_display_time_zone
(
time_zone_name
))
@ddt.data
((
ALL_TIME_ZONES_URI
,
43
2
),
(
COUNTRY_TIME_ZONES_URI
,
2
7
))
@ddt.data
((
ALL_TIME_ZONES_URI
,
43
6
),
(
COUNTRY_TIME_ZONES_URI
,
2
8
))
@ddt.unpack
def
test_get_basic
(
self
,
country_uri
,
expected_count
):
""" Verify that correct time zone info is returned """
...
...
requirements/edx/base.txt
View file @
83cfeb9d
...
...
@@ -90,7 +90,7 @@ python-dateutil==2.1
# We can also remove the fix to auth_url in third_party_auth/saml.py when that fix is included upstream.
python-social-auth==0.2.12
pytz==201
5.2
pytz==201
6.7
pysrt==0.4.7
PyYAML==3.10
requests==2.9.1
...
...
requirements/edx/github.txt
View file @
83cfeb9d
...
...
@@ -76,7 +76,7 @@ git+https://github.com/edx/XBlock.git@xblock-0.4.12#egg=XBlock==0.4.12
-e git+https://github.com/edx/event-tracking.git@0.2.1#egg=event-tracking==0.2.1
-e git+https://github.com/edx/django-splash.git@v0.2#egg=django-splash==0.2
-e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock
git+https://github.com/edx/edx-ora2.git@1.1.1
0#egg=ora2==1.1.10
git+https://github.com/edx/edx-ora2.git@1.1.1
1#egg=ora2==1.1.11
-e git+https://github.com/edx/edx-submissions.git@1.1.1#egg=edx-submissions==1.1.1
git+https://github.com/edx/ease.git@release-2015-07-14#egg=ease==0.1.3
git+https://github.com/edx/i18n-tools.git@v0.3.2#egg=i18n-tools==v0.3.2
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment