Skip to content

Commit

Permalink
Merge branch 'master' into huniafatima/replace-deprecated-github-actions
Browse files Browse the repository at this point in the history
  • Loading branch information
huniafatima-arbi authored Oct 9, 2024
2 parents 459823b + 1262d9f commit d88e783
Show file tree
Hide file tree
Showing 8 changed files with 102 additions and 97 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ jobs:
with:
name: coverage${{ matrix.pytest-split-group }}
path: .coverage
include-hidden-files: true

# Combine and upload coverage reports.
coverage:
Expand Down
1 change: 1 addition & 0 deletions pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ disable =
too-few-public-methods,
too-many-ancestors,
too-many-arguments,
too-many-positional-arguments,
too-many-branches,
too-many-instance-attributes,
too-many-lines,
Expand Down
2 changes: 1 addition & 1 deletion requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ elasticsearch-dsl==7.4.1
# via
# -c requirements/constraints.txt
# django-elasticsearch-dsl
idna==3.8
idna==3.10
# via requests
imagesize==1.4.1
# via sphinx
Expand Down
101 changes: 52 additions & 49 deletions requirements/local.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
#
accessible-pygments==0.0.5
# via pydata-sphinx-theme
aiohappyeyeballs==2.4.0
aiohappyeyeballs==2.4.3
# via aiohttp
aiohttp==3.10.5
aiohttp==3.10.9
# via openai
aiosignal==1.3.1
# via aiohttp
Expand All @@ -32,7 +32,7 @@ asgiref==3.8.1
# django-countries
asn1crypto==1.5.1
# via snowflake-connector-python
astroid==3.2.4
astroid==3.3.5
# via
# pylint
# pylint-celery
Expand All @@ -57,20 +57,20 @@ beautifulsoup4==4.12.3
# -r requirements/base.in
# pydata-sphinx-theme
# taxonomy-connector
billiard==4.2.0
billiard==4.2.1
# via celery
boltons==21.0.0
# via
# face
# glom
# semgrep
boto3==1.35.12
boto3==1.35.34
# via django-ses
botocore==1.35.12
botocore==1.35.34
# via
# boto3
# s3transfer
bracex==2.5
bracex==2.5.post1
# via wcmatch
cachetools==5.5.0
# via
Expand Down Expand Up @@ -157,7 +157,7 @@ defusedxml==0.7.1
# python3-openid
# semgrep
# social-auth-core
dill==0.3.8
dill==0.3.9
# via pylint
distlib==0.3.8
# via virtualenv
Expand Down Expand Up @@ -211,7 +211,7 @@ distlib==0.3.8
# social-auth-app-django
# taxonomy-connector
# xss-utils
django-admin-sortable2==2.2.2
django-admin-sortable2==2.2.3
# via -r requirements/base.in
django-appconf==1.0.6
# via django-compressor
Expand Down Expand Up @@ -278,13 +278,13 @@ django-nested-admin==4.1.1
# via -r requirements/base.in
django-nine==0.2.7
# via django-elasticsearch-dsl-drf
django-object-actions==4.2.0
django-object-actions==4.3.0
# via
# -r requirements/base.in
# taxonomy-connector
django-parler==2.3
# via -r requirements/base.in
django-ses==4.1.1
django-ses==4.2.0
# via taxonomy-connector
django-simple-history==3.7.0
# via -r requirements/base.in
Expand All @@ -300,7 +300,7 @@ django-stdimage==5.3.0
# -r requirements/base.in
django-storages==1.14.4
# via -r requirements/base.in
django-taggit==6.0.0
django-taggit==6.1.0
# via
# -r requirements/base.in
# django-taggit-autosuggest
Expand Down Expand Up @@ -330,7 +330,7 @@ djangorestframework-csv==3.0.2
# via -r requirements/base.in
djangorestframework-xml==2.0.0
# via -r requirements/base.in
dnspython==2.6.1
dnspython==2.7.0
# via pymongo
docutils==0.19
# via
Expand All @@ -348,9 +348,9 @@ drf-yasg==1.21.7
# edx-api-doc-tools
edx-analytics-data-api-client==0.18.3
# via -r requirements/base.in
edx-api-doc-tools==1.8.0
edx-api-doc-tools==2.0.0
# via -r requirements/base.in
edx-auth-backends==4.3.0
edx-auth-backends==4.4.0
# via -r requirements/base.in
edx-ccx-keys==1.3.0
# via
Expand All @@ -360,7 +360,7 @@ edx-django-release-util==1.4.0
# via -r requirements/base.in
edx-django-sites-extensions==4.2.0
# via -r requirements/base.in
edx-django-utils==5.15.0
edx-django-utils==5.16.0
# via
# -r requirements/base.in
# django-config-models
Expand All @@ -378,7 +378,7 @@ edx-event-bus-kafka==5.8.1
# via -r requirements/base.in
edx-event-bus-redis==0.5.0
# via -r requirements/base.in
edx-i18n-tools==1.6.2
edx-i18n-tools==1.6.3
# via -r requirements/local.in
edx-lint==5.3.7
# via
Expand All @@ -391,7 +391,7 @@ edx-opaque-keys[django]==2.11.0
# edx-drf-extensions
# openedx-events
# taxonomy-connector
edx-rest-api-client==5.7.1
edx-rest-api-client==6.0.0
# via
# -r requirements/base.in
# taxonomy-connector
Expand All @@ -418,11 +418,11 @@ face==22.0.0
# via glom
factory-boy==3.3.1
# via -r requirements/test.in
faker==28.4.1
faker==30.1.0
# via factory-boy
fastavro==1.9.5
fastavro==1.9.7
# via openedx-events
filelock==3.15.4
filelock==3.16.1
# via
# snowflake-connector-python
# tox
Expand All @@ -437,11 +437,11 @@ getsmarter-api-clients==0.6.1
# via -r requirements/base.in
glom==22.1.0
# via semgrep
google-api-core==2.19.2
google-api-core==2.20.0
# via google-api-python-client
google-api-python-client==2.143.0
google-api-python-client==2.147.0
# via -r requirements/base.in
google-auth==2.34.0
google-auth==2.35.0
# via
# google-api-core
# google-api-python-client
Expand All @@ -456,7 +456,7 @@ google-auth-oauthlib==1.2.1
# via gspread
googleapis-common-protos==1.65.0
# via google-api-core
gspread==6.1.2
gspread==6.1.3
# via -r requirements/base.in
h11==0.14.0
# via wsproto
Expand All @@ -466,15 +466,15 @@ httplib2==0.22.0
# via
# google-api-python-client
# google-auth-httplib2
idna==3.8
idna==3.10
# via
# requests
# snowflake-connector-python
# trio
# yarl
imagesize==1.4.1
# via sphinx
importlib-metadata==8.4.0
importlib-metadata==8.5.0
# via -r requirements/base.in
inflection==0.5.1
# via drf-yasg
Expand All @@ -498,7 +498,7 @@ jsonfield==3.1.0
# via -r requirements/base.in
jsonschema==3.2.0
# via semgrep
kombu==5.4.0
kombu==5.4.2
# via celery
libsass==0.23.0
# via django-libsass
Expand All @@ -518,15 +518,15 @@ mccabe==0.7.0
# via pylint
mock==5.1.0
# via -r requirements/test.in
more-itertools==10.4.0
more-itertools==10.5.0
# via simple-salesforce
multidict==6.0.5
multidict==6.1.0
# via
# aiohttp
# yarl
mysqlclient==2.2.4
# via -r requirements/test.in
newrelic==9.13.0
newrelic==10.0.0
# via edx-django-utils
oauthlib==3.2.2
# via
Expand All @@ -539,7 +539,7 @@ openai==0.28.1
# taxonomy-connector
openedx-atlas==0.6.2
# via -r requirements/base.in
openedx-events==9.12.0
openedx-events==9.14.1
# via
# edx-event-bus-kafka
# edx-event-bus-redis
Expand Down Expand Up @@ -569,7 +569,7 @@ pillow==9.5.0
# -r requirements/base.in
# cairosvg
# django-stdimage
platformdirs==4.2.2
platformdirs==4.3.6
# via
# pylint
# snowflake-connector-python
Expand All @@ -582,22 +582,22 @@ pluggy==1.5.0
# tox
polib==1.2.0
# via edx-i18n-tools
prompt-toolkit==3.0.47
prompt-toolkit==3.0.48
# via click-repl
proto-plus==1.24.0
# via google-api-core
protobuf==5.28.0
protobuf==5.28.2
# via
# google-api-core
# googleapis-common-protos
# proto-plus
psutil==6.0.0
# via edx-django-utils
pyasn1==0.6.0
pyasn1==0.6.1
# via
# pyasn1-modules
# rsa
pyasn1-modules==0.4.0
pyasn1-modules==0.4.1
# via google-auth
pycodestyle==2.12.1
# via -r requirements/test.in
Expand All @@ -621,7 +621,7 @@ pyjwt[crypto]==2.9.0
# simple-salesforce
# snowflake-connector-python
# social-auth-core
pylint==3.2.7
pylint==3.3.1
# via
# edx-lint
# pylint-celery
Expand All @@ -639,7 +639,7 @@ pymemcache==4.0.0
# via
# -r requirements/local.in
# -r requirements/test.in
pymongo==4.8.0
pymongo==4.10.1
# via edx-opaque-keys
pynacl==1.5.0
# via edx-django-utils
Expand All @@ -655,7 +655,7 @@ pyrsistent==0.20.0
# via jsonschema
pysocks==1.7.1
# via urllib3
pytest==8.3.2
pytest==8.3.3
# via
# -r requirements/test.in
# pytest-cov
Expand Down Expand Up @@ -698,7 +698,7 @@ python-stdnum==1.20
# via django-localflavor
python3-openid==3.2.0
# via social-auth-core
pytz==2024.1
pytz==2024.2
# via
# -r requirements/base.in
# drf-yasg
Expand All @@ -717,7 +717,7 @@ pyyaml==6.0.2
# responses
rcssmin==1.1.2
# via django-compressor
redis==5.0.8
redis==5.1.1
# via
# -r requirements/base.in
# walrus
Expand Down Expand Up @@ -792,12 +792,12 @@ six==1.16.0
# jsonschema
# python-dateutil
slumber==0.7.1
# via edx-rest-api-client
# via -r requirements/test.in
sniffio==1.3.1
# via trio
snowballstemmer==2.2.0
# via sphinx
snowflake-connector-python==3.12.1
snowflake-connector-python==3.12.2
# via -r requirements/base.in
social-auth-app-django==5.4.2
# via
Expand Down Expand Up @@ -872,12 +872,15 @@ typing-extensions==4.12.2
# via
# django-countries
# edx-opaque-keys
# faker
# pydata-sphinx-theme
# semgrep
# simple-salesforce
# snowflake-connector-python
tzdata==2024.1
# via celery
tzdata==2024.2
# via
# celery
# kombu
ujson==5.10.0
# via python-lsp-jsonrpc
unicodecsv==0.14.1
Expand All @@ -899,7 +902,7 @@ vine==5.1.0
# amqp
# celery
# kombu
virtualenv==20.26.3
virtualenv==20.26.6
# via tox
walrus==0.9.4
# via edx-event-bus-redis
Expand All @@ -915,11 +918,11 @@ wsproto==1.2.0
# via trio-websocket
xss-utils==0.6.0
# via -r requirements/base.in
yarl==1.9.11
yarl==1.13.1
# via aiohttp
zeep==4.2.1
# via simple-salesforce
zipp==3.20.1
zipp==3.20.2
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ wheel==0.44.0
# The following packages are considered to be unsafe in a requirements file:
pip==24.2
# via -r requirements/pip.in
setuptools==74.1.2
setuptools==75.1.0
# via -r requirements/pip.in
Loading

0 comments on commit d88e783

Please sign in to comment.