Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update pygeopip to geoip2

Browse Source 
Update deprecated pygeoip
to geoip2 and all usages
of it

Learner-6238
This commit is contained in:
adeelehsan
2019-02-19 17:37:16 +05:00
parent 974ae50bf4
commit 3e2764d9c0
18 changed files with 170 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
requirements/edx/base.in
View File

@@ -150,3 +150,4 @@ web-fragments # Provides the ability to render fragments o
XBlock # Courseware component architecture
xblock-utils # Provides utilities used by the Discussion XBlock
zendesk # Python API for the Zendesk customer support system
geoip2==2.9.0 # Python API for the GeoIP web services and databases

3
requirements/edx/base.txt
View File

@@ -26,7 +26,6 @@ git+https://github.com/edx/MongoDBProxy.git@25b99097615bda06bd7cdfe5669ed80dc2a7
-e .
git+https://github.com/edx/edx-ora2.git@2.2.1#egg=ora2==2.2.1
-e git+https://github.com/dgrtwo/ParsePy.git@7949b9f754d1445eff8e8f20d0e967b9a6420639#egg=parse_rest
-e git+https://github.com/appliedsec/pygeoip.git@95e69341cebf5a6a9fbf7c4f5439d458898bdc3b#egg=pygeoip
-e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev
-e git+https://github.com/edx/RateXBlock.git@367e19c0f6eac8a5f002fd0f1559555f8e74bfff#egg=rate-xblock
git+https://github.com/edx/RecommenderXBlock.git@1.4.0#egg=recommender-xblock==1.4.0
@@ -136,6 +135,7 @@ fs-s3fs==0.1.8
fs==2.0.18
future==0.17.1 # via pyjwkest
futures==3.2.0 ; python_version == "2.7" # via python-swiftclient, s3transfer, xblock-utils
geoip2==2.9.0
glob2==0.6
gunicorn==19.0
hash-ring==1.3.1 # via django-memcached-hashring
@@ -161,6 +161,7 @@ mako==1.0.2
markdown==2.6.11
markey==0.8 # via django-babel-underscore
markupsafe==1.1.0
maxminddb==1.4.1 # via geoip2
mock==1.0.1
mongoengine==0.10.0
mysql-python==1.2.5

7
requirements/edx/development.txt
View File

@@ -28,7 +28,6 @@ git+https://github.com/edx/MongoDBProxy.git@25b99097615bda06bd7cdfe5669ed80dc2a7
-e .
git+https://github.com/edx/edx-ora2.git@2.2.1#egg=ora2==2.2.1
-e git+https://github.com/dgrtwo/ParsePy.git@7949b9f754d1445eff8e8f20d0e967b9a6420639#egg=parse_rest
-e git+https://github.com/appliedsec/pygeoip.git@95e69341cebf5a6a9fbf7c4f5439d458898bdc3b#egg=pygeoip
-e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev
-e git+https://github.com/edx/RateXBlock.git@367e19c0f6eac8a5f002fd0f1559555f8e74bfff#egg=rate-xblock
git+https://github.com/edx/RecommenderXBlock.git@1.4.0#egg=recommender-xblock==1.4.0
@@ -60,7 +59,7 @@ beautifulsoup4==4.7.1
before-after==1.0.1
billiard==3.3.0.23
bleach==2.1.4
bok-choy==0.9.0
bok-choy==0.9.3
boto3==1.4.8
boto==2.39.0
botocore==1.8.17
@@ -174,6 +173,7 @@ functools32==3.2.3.post2 ; python_version == "2.7"
future==0.17.1
futures==3.2.0 ; python_version == "2.7"
fuzzywuzzy==0.17.0
geoip2==2.9.0
glob2==0.6
gunicorn==19.0
hash-ring==1.3.1
@@ -210,6 +210,7 @@ mando==0.6.4
markdown==2.6.11
markey==0.8
markupsafe==1.1.0
maxminddb==1.4.1
mccabe==0.6.1
mock==1.0.1
modernize==0.6.1
@@ -236,7 +237,7 @@ pbr==5.1.2
pdfminer==20140328
piexif==1.0.2
pillow==5.4.1
pip-tools==3.3.2
pip-tools==3.4.0
pkgconfig==1.4.0
pluggy==0.8.1
polib==1.1.0

1
requirements/edx/github.in
View File

@@ -66,7 +66,6 @@
-e git+https://github.com/edx/django-openid-auth.git@0.15.1#egg=django-openid-auth==0.15.1
-e git+https://github.com/edx/MongoDBProxy.git@25b99097615bda06bd7cdfe5669ed80dc2a7fed0#egg=MongoDBProxy==0.1.0
-e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev
-e git+https://github.com/appliedsec/pygeoip.git@95e69341cebf5a6a9fbf7c4f5439d458898bdc3b#egg=pygeoip
-e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme
-e git+https://github.com/mitodl/django-cas.git@afac57bc523f145ae826f4ed3d4fa8b2c86c5364#egg=django-cas==2.1.1
-e git+https://github.com/dgrtwo/ParsePy.git@7949b9f754d1445eff8e8f20d0e967b9a6420639#egg=parse_rest

2
requirements/edx/pip-tools.txt
View File

@@ -5,5 +5,5 @@
# make upgrade
#
click==7.0 # via pip-tools
pip-tools==3.3.2
pip-tools==3.4.0
six==1.11.0

5
requirements/edx/testing.txt
View File

@@ -27,7 +27,6 @@ git+https://github.com/edx/MongoDBProxy.git@25b99097615bda06bd7cdfe5669ed80dc2a7
-e .
git+https://github.com/edx/edx-ora2.git@2.2.1#egg=ora2==2.2.1
-e git+https://github.com/dgrtwo/ParsePy.git@7949b9f754d1445eff8e8f20d0e967b9a6420639#egg=parse_rest
-e git+https://github.com/appliedsec/pygeoip.git@95e69341cebf5a6a9fbf7c4f5439d458898bdc3b#egg=pygeoip
-e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev
-e git+https://github.com/edx/RateXBlock.git@367e19c0f6eac8a5f002fd0f1559555f8e74bfff#egg=rate-xblock
git+https://github.com/edx/RecommenderXBlock.git@1.4.0#egg=recommender-xblock==1.4.0
@@ -58,7 +57,7 @@ beautifulsoup4==4.7.1
before-after==1.0.1
billiard==3.3.0.23
bleach==2.1.4
bok-choy==0.9.0
bok-choy==0.9.3
boto3==1.4.8
boto==2.39.0
botocore==1.8.17
@@ -169,6 +168,7 @@ functools32==3.2.3.post2 ; python_version == "2.7" # via flake8, parsel
future==0.17.1
futures==3.2.0 ; python_version == "2.7"
fuzzywuzzy==0.17.0
geoip2==2.9.0
glob2==0.6
gunicorn==19.0
hash-ring==1.3.1
@@ -204,6 +204,7 @@ mando==0.6.4 # via radon
markdown==2.6.11
markey==0.8
markupsafe==1.1.0
maxminddb==1.4.1
mccabe==0.6.1 # via flake8, pylint
mock==1.0.1
mongoengine==0.10.0