Skip to content

Commit

Permalink
Merge branch 'master' into aht007/Ansible-to-Docker
Browse files Browse the repository at this point in the history
  • Loading branch information
ansabgillani authored Jan 10, 2023
2 parents 48e97a7 + 9ec66b4 commit 3ed4447
Show file tree
Hide file tree
Showing 6 changed files with 64 additions and 39 deletions.
4 changes: 2 additions & 2 deletions course_discovery/apps/course_metadata/data_loaders/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def _load_data(self, page): # pragma: no cover
response = self._make_request(page)
self._process_response(response)

# The courses endpoint has a 40 requests/minute rate limit.
# The courses endpoint has 40 requests/minute rate limit.
# This will back off at a rate of 60/120/240 seconds (from the factor 60 and default value of base 2).
# This backoff code can still fail because of the concurrent requests all requesting at the same time.
# So even in the case of entering into the next minute, if we still exceed our limit for that min,
Expand All @@ -93,7 +93,7 @@ def _load_data(self, page): # pragma: no cover
)
def _make_request(self, page):
logger.info('Requesting course run page %d...', page)
params = {'page': page, 'page_size': self.PAGE_SIZE, 'username': self.username}
params = {'page': page, 'page_size': self.PAGE_SIZE, 'username': self.username, 'active_only': True}
response = self.api_client.get(self.api_url + '/courses/', params=params)
response.raise_for_status()
return response.json()
Expand Down
5 changes: 5 additions & 0 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,8 @@ django-simple-history==3.0.0
# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
tox<4.0.0

# edx-sphinx-theme is not compatible with latest Sphinx==6.0.0 version
# Pinning Sphinx version unless the compatibility issue gets resolved
# For details, see issue https://github.com/openedx/edx-sphinx-theme/issues/197
sphinx<6.0.0
5 changes: 3 additions & 2 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jinja2==3.1.2
# via sphinx
markupsafe==2.1.1
# via jinja2
packaging==22.0
packaging==23.0
# via sphinx
pygments==2.14.0
# via sphinx
Expand All @@ -59,10 +59,11 @@ snowballstemmer==2.2.0
# via sphinx
sphinx==5.3.0
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/docs.in
# edx-sphinx-theme
sphinxcontrib-applehelp==1.0.2
sphinxcontrib-applehelp==1.0.3
# via sphinx
sphinxcontrib-devhelp==1.0.2
# via sphinx
Expand Down
52 changes: 31 additions & 21 deletions requirements/local.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ asn1crypto==1.5.1
# via
# oscrypto
# snowflake-connector-python
astroid==2.12.13
astroid==2.13.2
# via
# pylint
# pylint-celery
Expand Down Expand Up @@ -64,15 +64,15 @@ boltons==21.0.0
# face
# glom
# semgrep
boto3==1.26.41
boto3==1.26.46
# via django-ses
botocore==1.29.41
botocore==1.29.46
# via
# boto3
# s3transfer
bracex==2.3.post1
# via wcmatch
cachetools==5.2.0
cachetools==5.2.1
# via google-auth
cairocffi==1.4.0
# via cairosvg
Expand Down Expand Up @@ -134,7 +134,7 @@ coreschema==0.0.4
# via
# coreapi
# drf-yasg
coverage[toml]==7.0.2
coverage[toml]==7.0.4
# via
# -r requirements/test.in
# pytest-cov
Expand Down Expand Up @@ -218,7 +218,7 @@ django-choices==1.7.2
# via
# -r requirements/base.in
# taxonomy-connector
django-compressor==4.1
django-compressor==4.3
# via
# -r requirements/base.in
# django-libsass
Expand Down Expand Up @@ -368,7 +368,7 @@ edx-drf-extensions==8.2.0
# via
# -c requirements/constraints.txt
# -r requirements/base.in
edx-event-bus-kafka==3.4.1
edx-event-bus-kafka==3.5.1
# via -r requirements/base.in
edx-i18n-tools==0.9.2
# via -r requirements/local.in
Expand All @@ -380,6 +380,7 @@ edx-opaque-keys[django]==2.3.0
# edx-ccx-keys
# edx-drf-extensions
# openedx-events
# taxonomy-connector
edx-rest-api-client==5.5.0
# via
# -r requirements/base.in
Expand Down Expand Up @@ -411,7 +412,7 @@ face==22.0.0
# via glom
factory-boy==3.2.1
# via -r requirements/test.in
faker==15.3.4
faker==16.1.0
# via factory-boy
fastavro==1.7.0
# via openedx-events
Expand All @@ -426,7 +427,7 @@ future==0.18.2
# via pyjwkest
glom==22.1.0
# via semgrep
google-auth==2.15.0
google-auth==2.16.0
# via
# google-auth-oauthlib
# gspread
Expand All @@ -452,7 +453,7 @@ importlib-metadata==6.0.0
# sphinx
inflection==0.5.1
# via drf-yasg
iniconfig==1.1.1
iniconfig==2.0.0
# via pytest
isodate==0.6.1
# via zeep
Expand All @@ -479,7 +480,7 @@ jsonschema==3.2.0
# semgrep
kombu==5.2.4
# via celery
lazy-object-proxy==1.8.0
lazy-object-proxy==1.9.0
# via astroid
libsass==0.22.0
# via django-libsass
Expand All @@ -493,18 +494,22 @@ markupsafe==2.1.1
# via jinja2
mccabe==0.7.0
# via pylint
mock==5.0.0
mock==5.0.1
# via -r requirements/test.in
mysqlclient==2.1.1
# via -r requirements/test.in
newrelic==8.5.0
# via edx-django-utils
numpy==1.24.1
# via pandas
oauthlib==3.2.2
# via
# requests-oauthlib
# social-auth-core
openedx-events==4.0.0
# via edx-event-bus-kafka
openedx-events==4.1.0
# via
# edx-event-bus-kafka
# taxonomy-connector
oscrypto==1.3.0
# via snowflake-connector-python
outcome==1.2.0
Expand All @@ -518,6 +523,8 @@ packaging==21.3
# semgrep
# sphinx
# tox
pandas==1.5.2
# via taxonomy-connector
paramiko==2.12.0
# via docker
path==16.6.0
Expand Down Expand Up @@ -576,7 +583,7 @@ pyjwt[crypto]==2.6.0
# edx-rest-api-client
# snowflake-connector-python
# social-auth-core
pylint==2.15.9
pylint==2.15.10
# via
# edx-lint
# pylint-celery
Expand Down Expand Up @@ -631,6 +638,7 @@ python-dateutil==2.8.2
# elasticsearch-dsl
# faker
# freezegun
# pandas
python-dotenv==0.21.0
# via docker-compose
python-lsp-jsonrpc==1.0.0
Expand All @@ -656,6 +664,7 @@ pytz==2022.7
# django-ses
# djangorestframework
# drf-yasg
# pandas
# snowflake-connector-python
# taxonomy-connector
# zeep
Expand All @@ -667,9 +676,9 @@ pyyaml==5.4.1
# docker-compose
# edx-django-release-util
# edx-i18n-tools
rcssmin==1.1.0
rcssmin==1.1.1
# via django-compressor
redis==4.4.0
redis==4.4.1
# via -r requirements/base.in
requests==2.28.1
# via
Expand Down Expand Up @@ -706,7 +715,7 @@ responses==0.22.0
# via
# -r requirements/test.in
# pytest-responses
rjsmin==1.2.0
rjsmin==1.2.1
# via django-compressor
rsa==4.9
# via google-auth
Expand Down Expand Up @@ -777,10 +786,11 @@ soupsieve==2.3.2.post1
# via beautifulsoup4
sphinx==5.3.0
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/docs.in
# edx-sphinx-theme
sphinxcontrib-applehelp==1.0.2
sphinxcontrib-applehelp==1.0.3
# via sphinx
sphinxcontrib-devhelp==1.0.2
# via sphinx
Expand All @@ -801,7 +811,7 @@ stevedore==4.1.1
# code-annotations
# edx-django-utils
# edx-opaque-keys
taxonomy-connector==1.32.2
taxonomy-connector==1.34.0
# via -r requirements/base.in
testfixtures==7.0.4
# via -r requirements/test.in
Expand Down Expand Up @@ -844,7 +854,7 @@ typing-extensions==4.4.0
# pylint
# semgrep
# snowflake-connector-python
ujson==5.6.0
ujson==5.7.0
# via python-lsp-jsonrpc
unicodecsv==0.14.1
# via djangorestframework-csv
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip_tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ build==0.9.0
# via pip-tools
click==8.1.3
# via pip-tools
packaging==22.0
packaging==23.0
# via build
pep517==0.13.0
# via build
Expand Down
35 changes: 22 additions & 13 deletions requirements/production.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ beautifulsoup4==4.11.1
# taxonomy-connector
billiard==3.6.4.0
# via celery
boto3==1.26.41
boto3==1.26.46
# via django-ses
botocore==1.29.41
botocore==1.29.46
# via
# boto3
# s3transfer
cachetools==5.2.0
cachetools==5.2.1
# via google-auth
cairocffi==1.4.0
# via cairosvg
Expand Down Expand Up @@ -164,7 +164,7 @@ django-choices==1.7.2
# via
# -r requirements/base.in
# taxonomy-connector
django-compressor==4.1
django-compressor==4.3
# via
# -r requirements/base.in
# django-libsass
Expand Down Expand Up @@ -302,14 +302,15 @@ edx-drf-extensions==8.2.0
# via
# -c requirements/constraints.txt
# -r requirements/base.in
edx-event-bus-kafka==3.4.1
edx-event-bus-kafka==3.5.1
# via -r requirements/base.in
edx-opaque-keys[django]==2.3.0
# via
# -r requirements/base.in
# edx-ccx-keys
# edx-drf-extensions
# openedx-events
# taxonomy-connector
edx-rest-api-client==5.5.0
# via
# -r requirements/base.in
Expand Down Expand Up @@ -337,7 +338,7 @@ future==0.18.2
# via pyjwkest
gevent==22.10.2
# via -r requirements/production.in
google-auth==2.15.0
google-auth==2.16.0
# via
# google-auth-oauthlib
# gspread
Expand Down Expand Up @@ -393,18 +394,24 @@ newrelic==8.5.0
# via
# -r requirements/production.in
# edx-django-utils
numpy==1.24.1
# via pandas
oauthlib==3.2.2
# via
# requests-oauthlib
# social-auth-core
openedx-events==4.0.0
# via edx-event-bus-kafka
openedx-events==4.1.0
# via
# edx-event-bus-kafka
# taxonomy-connector
oscrypto==1.3.0
# via snowflake-connector-python
packaging==22.0
packaging==23.0
# via
# django-nine
# drf-yasg
pandas==1.5.2
# via taxonomy-connector
pbr==5.11.0
# via stevedore
pillow==9.4.0
Expand Down Expand Up @@ -455,6 +462,7 @@ python-dateutil==2.8.2
# contentful
# edx-drf-extensions
# elasticsearch-dsl
# pandas
python-memcached==1.59
# via -r requirements/production.in
python-monkey-business==1.0.0
Expand All @@ -475,6 +483,7 @@ pytz==2022.7
# django-ses
# djangorestframework
# drf-yasg
# pandas
# snowflake-connector-python
# taxonomy-connector
# zeep
Expand All @@ -483,9 +492,9 @@ pyyaml==6.0
# -r requirements/production.in
# code-annotations
# edx-django-release-util
rcssmin==1.1.0
rcssmin==1.1.1
# via django-compressor
redis==4.4.0
redis==4.4.1
# via -r requirements/base.in
requests==2.28.1
# via
Expand Down Expand Up @@ -513,7 +522,7 @@ requests-oauthlib==1.3.1
# social-auth-core
requests-toolbelt==0.10.1
# via zeep
rjsmin==1.2.0
rjsmin==1.2.1
# via django-compressor
rsa==4.9
# via google-auth
Expand Down Expand Up @@ -568,7 +577,7 @@ stevedore==4.1.1
# code-annotations
# edx-django-utils
# edx-opaque-keys
taxonomy-connector==1.32.2
taxonomy-connector==1.34.0
# via -r requirements/base.in
text-unidecode==1.3
# via python-slugify
Expand Down

0 comments on commit 3ed4447

Please sign in to comment.