From 4b975becddfdd7a4b62d81d0255b0041a4f6762f Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Mon, 10 Oct 2022 11:22:49 -0400 Subject: [PATCH 01/11] chore: Updating Python Requirements --- requirements/base.txt | 36 +++++++++++++++++---------------- requirements/ci.txt | 6 +++--- requirements/dev.txt | 36 +++++++++++++++++---------------- requirements/django.txt | 2 +- requirements/doc.txt | 40 +++++++++++++++++++------------------ requirements/pip.txt | 2 +- requirements/pip_tools.txt | 2 +- requirements/production.txt | 40 +++++++++++++++++++------------------ requirements/test.txt | 40 +++++++++++++++++++------------------ 9 files changed, 107 insertions(+), 97 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index fc0c4271..33e3e294 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,13 +8,13 @@ asgiref==3.5.2 # via django boto==2.49.0 # via -r requirements/base.in -boto3==1.24.70 +boto3==1.24.89 # via -r requirements/base.in -botocore==1.27.70 +botocore==1.27.89 # via # boto3 # s3transfer -certifi==2022.6.15.1 +certifi==2022.9.24 # via requests cffi==1.15.1 # via @@ -36,7 +36,7 @@ cryptography==38.0.1 # via # django-fernet-fields # pyjwt -django==3.2.15 +django==3.2.16 # via # -c requirements/constraints.txt # -r requirements/base.in @@ -57,7 +57,7 @@ django==3.2.15 # edx-rbac django-cors-headers==3.13.0 # via -r requirements/base.in -django-countries==7.3.2 +django-countries==7.4.2 # via -r requirements/base.in django-crum==0.7.9 # via @@ -79,7 +79,7 @@ django-waffle==3.0.0 # via # edx-django-utils # edx-drf-extensions -djangorestframework==3.13.1 +djangorestframework==3.14.0 # via # -r requirements/base.in # djangorestframework-csv @@ -91,7 +91,7 @@ djangorestframework-csv==2.1.1 # via -r requirements/base.in drf-jwt==1.19.2 # via edx-drf-extensions -drf-yasg==1.21.3 +drf-yasg==1.21.4 # via edx-api-doc-tools edx-api-doc-tools==1.6.0 # via -r requirements/base.in @@ -99,7 +99,7 @@ edx-ccx-keys==1.2.1 # via -r requirements/base.in edx-django-release-util==1.2.0 # via -r requirements/base.in -edx-django-utils==5.0.1 +edx-django-utils==5.2.0 # via # -r requirements/base.in # edx-drf-extensions @@ -126,15 +126,15 @@ edx-rest-api-client==5.5.0 # edx-enterprise-data factory-boy==3.2.1 # via edx-enterprise-data -faker==14.2.0 +faker==15.0.0 # via factory-boy future==0.18.2 # via pyjwkest html5lib==1.1 # via -r requirements/base.in -idna==3.3 +idna==3.4 # via requests -importlib-metadata==4.12.0 +importlib-metadata==5.0.0 # via markdown inflection==0.5.1 # via drf-yasg @@ -150,7 +150,7 @@ markdown==3.4.1 # via -r requirements/base.in markupsafe==2.1.1 # via jinja2 -newrelic==8.0.0.179 +newrelic==8.2.0.181 # via edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in @@ -166,7 +166,7 @@ pycryptodomex==3.15.0 # via pyjwkest pyjwkest==1.4.2 # via edx-drf-extensions -pyjwt[crypto]==2.4.0 +pyjwt[crypto]==2.5.0 # via # drf-jwt # edx-drf-extensions @@ -184,7 +184,7 @@ python-dateutil==2.8.2 # faker python-memcached==1.59 # via -r requirements/base.in -pytz==2022.2.1 +pytz==2022.4 # via # django # djangorestframework @@ -222,7 +222,7 @@ six==1.16.0 # python-memcached slumber==0.7.1 # via edx-rest-api-client -sqlparse==0.4.2 +sqlparse==0.4.3 # via django stevedore==4.0.0 # via @@ -230,7 +230,9 @@ stevedore==4.0.0 # edx-opaque-keys tqdm==4.64.1 # via -r requirements/base.in -typing-extensions==4.3.0 +types-cryptography==3.3.23 + # via pyjwt +typing-extensions==4.4.0 # via django-countries unicodecsv==0.14.1 # via djangorestframework-csv @@ -245,5 +247,5 @@ urllib3==1.26.12 # requests webencodings==0.5.1 # via html5lib -zipp==3.8.1 +zipp==3.9.0 # via importlib-metadata diff --git a/requirements/ci.txt b/requirements/ci.txt index 543fbd0b..f18b0b78 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,15 +4,15 @@ # # make upgrade # -certifi==2022.6.15.1 +certifi==2022.9.24 # via requests charset-normalizer==2.1.1 # via requests codecov==2.1.12 # via -r requirements/ci.in -coverage==6.4.4 +coverage==6.5.0 # via codecov -idna==3.3 +idna==3.4 # via requests requests==2.28.1 # via codecov diff --git a/requirements/dev.txt b/requirements/dev.txt index fc0c4271..33e3e294 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -8,13 +8,13 @@ asgiref==3.5.2 # via django boto==2.49.0 # via -r requirements/base.in -boto3==1.24.70 +boto3==1.24.89 # via -r requirements/base.in -botocore==1.27.70 +botocore==1.27.89 # via # boto3 # s3transfer -certifi==2022.6.15.1 +certifi==2022.9.24 # via requests cffi==1.15.1 # via @@ -36,7 +36,7 @@ cryptography==38.0.1 # via # django-fernet-fields # pyjwt -django==3.2.15 +django==3.2.16 # via # -c requirements/constraints.txt # -r requirements/base.in @@ -57,7 +57,7 @@ django==3.2.15 # edx-rbac django-cors-headers==3.13.0 # via -r requirements/base.in -django-countries==7.3.2 +django-countries==7.4.2 # via -r requirements/base.in django-crum==0.7.9 # via @@ -79,7 +79,7 @@ django-waffle==3.0.0 # via # edx-django-utils # edx-drf-extensions -djangorestframework==3.13.1 +djangorestframework==3.14.0 # via # -r requirements/base.in # djangorestframework-csv @@ -91,7 +91,7 @@ djangorestframework-csv==2.1.1 # via -r requirements/base.in drf-jwt==1.19.2 # via edx-drf-extensions -drf-yasg==1.21.3 +drf-yasg==1.21.4 # via edx-api-doc-tools edx-api-doc-tools==1.6.0 # via -r requirements/base.in @@ -99,7 +99,7 @@ edx-ccx-keys==1.2.1 # via -r requirements/base.in edx-django-release-util==1.2.0 # via -r requirements/base.in -edx-django-utils==5.0.1 +edx-django-utils==5.2.0 # via # -r requirements/base.in # edx-drf-extensions @@ -126,15 +126,15 @@ edx-rest-api-client==5.5.0 # edx-enterprise-data factory-boy==3.2.1 # via edx-enterprise-data -faker==14.2.0 +faker==15.0.0 # via factory-boy future==0.18.2 # via pyjwkest html5lib==1.1 # via -r requirements/base.in -idna==3.3 +idna==3.4 # via requests -importlib-metadata==4.12.0 +importlib-metadata==5.0.0 # via markdown inflection==0.5.1 # via drf-yasg @@ -150,7 +150,7 @@ markdown==3.4.1 # via -r requirements/base.in markupsafe==2.1.1 # via jinja2 -newrelic==8.0.0.179 +newrelic==8.2.0.181 # via edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in @@ -166,7 +166,7 @@ pycryptodomex==3.15.0 # via pyjwkest pyjwkest==1.4.2 # via edx-drf-extensions -pyjwt[crypto]==2.4.0 +pyjwt[crypto]==2.5.0 # via # drf-jwt # edx-drf-extensions @@ -184,7 +184,7 @@ python-dateutil==2.8.2 # faker python-memcached==1.59 # via -r requirements/base.in -pytz==2022.2.1 +pytz==2022.4 # via # django # djangorestframework @@ -222,7 +222,7 @@ six==1.16.0 # python-memcached slumber==0.7.1 # via edx-rest-api-client -sqlparse==0.4.2 +sqlparse==0.4.3 # via django stevedore==4.0.0 # via @@ -230,7 +230,9 @@ stevedore==4.0.0 # edx-opaque-keys tqdm==4.64.1 # via -r requirements/base.in -typing-extensions==4.3.0 +types-cryptography==3.3.23 + # via pyjwt +typing-extensions==4.4.0 # via django-countries unicodecsv==0.14.1 # via djangorestframework-csv @@ -245,5 +247,5 @@ urllib3==1.26.12 # requests webencodings==0.5.1 # via html5lib -zipp==3.8.1 +zipp==3.9.0 # via importlib-metadata diff --git a/requirements/django.txt b/requirements/django.txt index 8d21206b..e92ee8ee 100644 --- a/requirements/django.txt +++ b/requirements/django.txt @@ -1 +1 @@ -django==3.2.15 +django==3.2.16 diff --git a/requirements/doc.txt b/requirements/doc.txt index f73eff14..ae14b37e 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -12,13 +12,13 @@ babel==2.10.3 # via sphinx boto==2.49.0 # via -r requirements/base.in -boto3==1.24.70 +boto3==1.24.89 # via -r requirements/base.in -botocore==1.27.70 +botocore==1.27.89 # via # boto3 # s3transfer -certifi==2022.6.15.1 +certifi==2022.9.24 # via requests cffi==1.15.1 # via @@ -40,7 +40,7 @@ cryptography==38.0.1 # via # django-fernet-fields # pyjwt -django==3.2.15 +django==3.2.16 # via # -c requirements/constraints.txt # -r requirements/base.in @@ -61,7 +61,7 @@ django==3.2.15 # edx-rbac django-cors-headers==3.13.0 # via -r requirements/base.in -django-countries==7.3.2 +django-countries==7.4.2 # via -r requirements/base.in django-crum==0.7.9 # via @@ -83,7 +83,7 @@ django-waffle==3.0.0 # via # edx-django-utils # edx-drf-extensions -djangorestframework==3.13.1 +djangorestframework==3.14.0 # via # -r requirements/base.in # djangorestframework-csv @@ -97,7 +97,7 @@ docutils==0.19 # via sphinx drf-jwt==1.19.2 # via edx-drf-extensions -drf-yasg==1.21.3 +drf-yasg==1.21.4 # via edx-api-doc-tools edx-api-doc-tools==1.6.0 # via -r requirements/base.in @@ -105,7 +105,7 @@ edx-ccx-keys==1.2.1 # via -r requirements/base.in edx-django-release-util==1.2.0 # via -r requirements/base.in -edx-django-utils==5.0.1 +edx-django-utils==5.2.0 # via # -r requirements/base.in # edx-drf-extensions @@ -134,17 +134,17 @@ edx-sphinx-theme==3.0.0 # via -r requirements/doc.in factory-boy==3.2.1 # via edx-enterprise-data -faker==14.2.0 +faker==15.0.0 # via factory-boy future==0.18.2 # via pyjwkest html5lib==1.1 # via -r requirements/base.in -idna==3.3 +idna==3.4 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==4.12.0 +importlib-metadata==5.0.0 # via # markdown # sphinx @@ -164,7 +164,7 @@ markdown==3.4.1 # via -r requirements/base.in markupsafe==2.1.1 # via jinja2 -newrelic==8.0.0.179 +newrelic==8.2.0.181 # via edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in @@ -172,7 +172,7 @@ packaging==21.3 # via # drf-yasg # sphinx -path==16.4.0 +path==16.5.0 # via -r requirements/doc.in pbr==5.10.0 # via stevedore @@ -186,7 +186,7 @@ pygments==2.13.0 # via sphinx pyjwkest==1.4.2 # via edx-drf-extensions -pyjwt[crypto]==2.4.0 +pyjwt[crypto]==2.5.0 # via # drf-jwt # edx-drf-extensions @@ -204,7 +204,7 @@ python-dateutil==2.8.2 # faker python-memcached==1.59 # via -r requirements/base.in -pytz==2022.2.1 +pytz==2022.4 # via # babel # django @@ -247,7 +247,7 @@ slumber==0.7.1 # via edx-rest-api-client snowballstemmer==2.2.0 # via sphinx -sphinx==5.1.1 +sphinx==5.2.3 # via # -r requirements/doc.in # edx-sphinx-theme @@ -263,7 +263,7 @@ sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 # via sphinx -sqlparse==0.4.2 +sqlparse==0.4.3 # via django stevedore==4.0.0 # via @@ -271,7 +271,9 @@ stevedore==4.0.0 # edx-opaque-keys tqdm==4.64.1 # via -r requirements/base.in -typing-extensions==4.3.0 +types-cryptography==3.3.23 + # via pyjwt +typing-extensions==4.4.0 # via django-countries unicodecsv==0.14.1 # via djangorestframework-csv @@ -286,5 +288,5 @@ urllib3==1.26.12 # requests webencodings==0.5.1 # via html5lib -zipp==3.8.1 +zipp==3.9.0 # via importlib-metadata diff --git a/requirements/pip.txt b/requirements/pip.txt index a14541b6..ae5215b9 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -10,5 +10,5 @@ wheel==0.37.1 # The following packages are considered to be unsafe in a requirements file: pip==22.2.2 # via -r requirements/pip.in -setuptools==65.3.0 +setuptools==65.4.1 # via -r requirements/pip.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 02f5a0ce..9105a968 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -12,7 +12,7 @@ packaging==21.3 # via build pep517==0.13.0 # via build -pip-tools==6.8.0 +pip-tools==6.9.0 # via -r requirements/pip_tools.in pyparsing==3.0.9 # via packaging diff --git a/requirements/production.txt b/requirements/production.txt index 2efa263e..4956e1b4 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -8,13 +8,13 @@ asgiref==3.5.2 # via django boto==2.49.0 # via -r requirements/base.in -boto3==1.24.70 +boto3==1.24.89 # via -r requirements/base.in -botocore==1.27.70 +botocore==1.27.89 # via # boto3 # s3transfer -certifi==2022.6.15.1 +certifi==2022.9.24 # via requests cffi==1.15.1 # via @@ -36,7 +36,7 @@ cryptography==38.0.1 # via # django-fernet-fields # pyjwt -django==3.2.15 +django==3.2.16 # via # -c requirements/constraints.txt # -r requirements/base.in @@ -57,7 +57,7 @@ django==3.2.15 # edx-rbac django-cors-headers==3.13.0 # via -r requirements/base.in -django-countries==7.3.2 +django-countries==7.4.2 # via -r requirements/base.in django-crum==0.7.9 # via @@ -79,7 +79,7 @@ django-waffle==3.0.0 # via # edx-django-utils # edx-drf-extensions -djangorestframework==3.13.1 +djangorestframework==3.14.0 # via # -r requirements/base.in # djangorestframework-csv @@ -91,7 +91,7 @@ djangorestframework-csv==2.1.1 # via -r requirements/base.in drf-jwt==1.19.2 # via edx-drf-extensions -drf-yasg==1.21.3 +drf-yasg==1.21.4 # via edx-api-doc-tools edx-api-doc-tools==1.6.0 # via -r requirements/base.in @@ -99,7 +99,7 @@ edx-ccx-keys==1.2.1 # via -r requirements/base.in edx-django-release-util==1.2.0 # via -r requirements/base.in -edx-django-utils==5.0.1 +edx-django-utils==5.2.0 # via # -r requirements/base.in # edx-drf-extensions @@ -126,11 +126,11 @@ edx-rest-api-client==5.5.0 # edx-enterprise-data factory-boy==3.2.1 # via edx-enterprise-data -faker==14.2.0 +faker==15.0.0 # via factory-boy future==0.18.2 # via pyjwkest -gevent==21.12.0 +gevent==22.8.0 # via -r requirements/production.in greenlet==1.1.3 # via gevent @@ -138,9 +138,9 @@ gunicorn==20.1.0 # via -r requirements/production.in html5lib==1.1 # via -r requirements/base.in -idna==3.3 +idna==3.4 # via requests -importlib-metadata==4.12.0 +importlib-metadata==5.0.0 # via markdown inflection==0.5.1 # via drf-yasg @@ -158,7 +158,7 @@ markupsafe==2.1.1 # via jinja2 mysqlclient==2.1.1 # via -r requirements/production.in -newrelic==8.0.0.179 +newrelic==8.2.0.181 # via # -r requirements/production.in # edx-django-utils @@ -178,7 +178,7 @@ pycryptodomex==3.15.0 # via pyjwkest pyjwkest==1.4.2 # via edx-drf-extensions -pyjwt[crypto]==2.4.0 +pyjwt[crypto]==2.5.0 # via # drf-jwt # edx-drf-extensions @@ -196,7 +196,7 @@ python-dateutil==2.8.2 # faker python-memcached==1.59 # via -r requirements/base.in -pytz==2022.2.1 +pytz==2022.4 # via # django # djangorestframework @@ -236,7 +236,7 @@ six==1.16.0 # python-memcached slumber==0.7.1 # via edx-rest-api-client -sqlparse==0.4.2 +sqlparse==0.4.3 # via django stevedore==4.0.0 # via @@ -244,7 +244,9 @@ stevedore==4.0.0 # edx-opaque-keys tqdm==4.64.1 # via -r requirements/base.in -typing-extensions==4.3.0 +types-cryptography==3.3.23 + # via pyjwt +typing-extensions==4.4.0 # via django-countries unicodecsv==0.14.1 # via djangorestframework-csv @@ -259,11 +261,11 @@ urllib3==1.26.12 # requests webencodings==0.5.1 # via html5lib -zipp==3.8.1 +zipp==3.9.0 # via importlib-metadata zope-event==4.5.0 # via gevent -zope-interface==5.4.0 +zope-interface==5.5.0 # via gevent # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.txt b/requirements/test.txt index ee5ddd29..bc15348d 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -12,13 +12,13 @@ attrs==22.1.0 # via pytest boto==2.49.0 # via -r requirements/base.in -boto3==1.24.70 +boto3==1.24.89 # via -r requirements/base.in -botocore==1.27.70 +botocore==1.27.89 # via # boto3 # s3transfer -certifi==2022.6.15.1 +certifi==2022.9.24 # via requests cffi==1.15.1 # via @@ -38,7 +38,7 @@ coreschema==0.0.4 # via # coreapi # drf-yasg -coverage[toml]==6.4.4 +coverage[toml]==6.5.0 # via # -r requirements/test.in # pytest-cov @@ -48,7 +48,7 @@ cryptography==38.0.1 # pyjwt ddt==1.6.0 # via -r requirements/test.in -diff-cover==6.5.1 +diff-cover==7.0.1 # via -r requirements/test.in # via # -c requirements/constraints.txt @@ -70,7 +70,7 @@ diff-cover==6.5.1 # edx-rbac django-cors-headers==3.13.0 # via -r requirements/base.in -django-countries==7.3.2 +django-countries==7.4.2 # via -r requirements/base.in django-crum==0.7.9 # via @@ -94,7 +94,7 @@ django-waffle==3.0.0 # via # edx-django-utils # edx-drf-extensions -djangorestframework==3.13.1 +djangorestframework==3.14.0 # via # -r requirements/base.in # djangorestframework-csv @@ -106,7 +106,7 @@ djangorestframework-csv==2.1.1 # via -r requirements/base.in drf-jwt==1.19.2 # via edx-drf-extensions -drf-yasg==1.21.3 +drf-yasg==1.21.4 # via edx-api-doc-tools edx-api-doc-tools==1.6.0 # via -r requirements/base.in @@ -114,7 +114,7 @@ edx-ccx-keys==1.2.1 # via -r requirements/base.in edx-django-release-util==1.2.0 # via -r requirements/base.in -edx-django-utils==5.0.1 +edx-django-utils==5.2.0 # via # -r requirements/base.in # edx-drf-extensions @@ -141,7 +141,7 @@ edx-rest-api-client==5.5.0 # edx-enterprise-data factory-boy==3.2.1 # via edx-enterprise-data -faker==14.2.0 +faker==15.0.0 # via factory-boy freezegun==1.2.2 # via -r requirements/test.in @@ -149,9 +149,9 @@ future==0.18.2 # via pyjwkest html5lib==1.1 # via -r requirements/base.in -idna==3.3 +idna==3.4 # via requests -importlib-metadata==4.12.0 +importlib-metadata==5.0.0 # via markdown inflection==0.5.1 # via drf-yasg @@ -177,7 +177,7 @@ markupsafe==2.1.1 # via jinja2 mccabe==0.6.1 # via pylint -newrelic==8.0.0.179 +newrelic==8.2.0.181 # via edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in @@ -207,7 +207,7 @@ pygments==2.13.0 # via diff-cover pyjwkest==1.4.2 # via edx-drf-extensions -pyjwt[crypto]==2.4.0 +pyjwt[crypto]==2.5.0 # via # drf-jwt # edx-drf-extensions @@ -226,7 +226,7 @@ pytest==7.1.3 # via # pytest-cov # pytest-django -pytest-cov==3.0.0 +pytest-cov==4.0.0 # via -r requirements/test.in pytest-django==4.5.2 # via -r requirements/test.in @@ -238,7 +238,7 @@ python-dateutil==2.8.2 # freezegun python-memcached==1.59 # via -r requirements/base.in -pytz==2022.2.1 +pytz==2022.4 # via # -r requirements/test.in # django @@ -284,7 +284,7 @@ slumber==0.7.1 # via edx-rest-api-client snowballstemmer==2.2.0 # via pydocstyle -sqlparse==0.4.2 +sqlparse==0.4.3 # via django stevedore==4.0.0 # via @@ -296,7 +296,9 @@ tomli==2.0.1 # pytest tqdm==4.64.1 # via -r requirements/base.in -typing-extensions==4.3.0 +types-cryptography==3.3.23 + # via pyjwt +typing-extensions==4.4.0 # via django-countries unicodecsv==0.14.1 # via djangorestframework-csv @@ -314,5 +316,5 @@ webencodings==0.5.1 # via html5lib wrapt==1.11.2 # via astroid -zipp==3.8.1 +zipp==3.9.0 # via importlib-metadata From a4c0ff39b875b6a31300a9246ac1e959dc4c98fa Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Mon, 24 Oct 2022 11:22:44 -0400 Subject: [PATCH 02/11] chore: Updating Python Requirements --- requirements/base.txt | 24 +++++++++++------------- requirements/dev.txt | 24 +++++++++++------------- requirements/doc.txt | 26 ++++++++++++-------------- requirements/pip.txt | 4 ++-- requirements/production.txt | 28 +++++++++++++--------------- requirements/test.txt | 30 ++++++++++++++++-------------- 6 files changed, 65 insertions(+), 71 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 33e3e294..5a03906c 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,9 +8,9 @@ asgiref==3.5.2 # via django boto==2.49.0 # via -r requirements/base.in -boto3==1.24.89 +boto3==1.24.96 # via -r requirements/base.in -botocore==1.27.89 +botocore==1.27.96 # via # boto3 # s3transfer @@ -126,7 +126,7 @@ edx-rest-api-client==5.5.0 # edx-enterprise-data factory-boy==3.2.1 # via edx-enterprise-data -faker==15.0.0 +faker==15.1.1 # via factory-boy future==0.18.2 # via pyjwkest @@ -150,15 +150,15 @@ markdown==3.4.1 # via -r requirements/base.in markupsafe==2.1.1 # via jinja2 -newrelic==8.2.0.181 +newrelic==8.2.1 # via edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in packaging==21.3 # via drf-yasg -pbr==5.10.0 +pbr==5.11.0 # via stevedore -psutil==5.9.2 +psutil==5.9.3 # via edx-django-utils pycparser==2.21 # via cffi @@ -166,7 +166,7 @@ pycryptodomex==3.15.0 # via pyjwkest pyjwkest==1.4.2 # via edx-drf-extensions -pyjwt[crypto]==2.5.0 +pyjwt[crypto]==2.6.0 # via # drf-jwt # edx-drf-extensions @@ -184,7 +184,7 @@ python-dateutil==2.8.2 # faker python-memcached==1.59 # via -r requirements/base.in -pytz==2022.4 +pytz==2022.5 # via # django # djangorestframework @@ -201,7 +201,7 @@ requests==2.28.1 # slumber ruamel-yaml==0.17.21 # via drf-yasg -ruamel-yaml-clib==0.2.6 +ruamel-yaml-clib==0.2.7 # via ruamel-yaml rules==3.3 # via edx-enterprise-data @@ -224,14 +224,12 @@ slumber==0.7.1 # via edx-rest-api-client sqlparse==0.4.3 # via django -stevedore==4.0.0 +stevedore==4.1.0 # via # edx-django-utils # edx-opaque-keys tqdm==4.64.1 # via -r requirements/base.in -types-cryptography==3.3.23 - # via pyjwt typing-extensions==4.4.0 # via django-countries unicodecsv==0.14.1 @@ -247,5 +245,5 @@ urllib3==1.26.12 # requests webencodings==0.5.1 # via html5lib -zipp==3.9.0 +zipp==3.10.0 # via importlib-metadata diff --git a/requirements/dev.txt b/requirements/dev.txt index 33e3e294..5a03906c 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -8,9 +8,9 @@ asgiref==3.5.2 # via django boto==2.49.0 # via -r requirements/base.in -boto3==1.24.89 +boto3==1.24.96 # via -r requirements/base.in -botocore==1.27.89 +botocore==1.27.96 # via # boto3 # s3transfer @@ -126,7 +126,7 @@ edx-rest-api-client==5.5.0 # edx-enterprise-data factory-boy==3.2.1 # via edx-enterprise-data -faker==15.0.0 +faker==15.1.1 # via factory-boy future==0.18.2 # via pyjwkest @@ -150,15 +150,15 @@ markdown==3.4.1 # via -r requirements/base.in markupsafe==2.1.1 # via jinja2 -newrelic==8.2.0.181 +newrelic==8.2.1 # via edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in packaging==21.3 # via drf-yasg -pbr==5.10.0 +pbr==5.11.0 # via stevedore -psutil==5.9.2 +psutil==5.9.3 # via edx-django-utils pycparser==2.21 # via cffi @@ -166,7 +166,7 @@ pycryptodomex==3.15.0 # via pyjwkest pyjwkest==1.4.2 # via edx-drf-extensions -pyjwt[crypto]==2.5.0 +pyjwt[crypto]==2.6.0 # via # drf-jwt # edx-drf-extensions @@ -184,7 +184,7 @@ python-dateutil==2.8.2 # faker python-memcached==1.59 # via -r requirements/base.in -pytz==2022.4 +pytz==2022.5 # via # django # djangorestframework @@ -201,7 +201,7 @@ requests==2.28.1 # slumber ruamel-yaml==0.17.21 # via drf-yasg -ruamel-yaml-clib==0.2.6 +ruamel-yaml-clib==0.2.7 # via ruamel-yaml rules==3.3 # via edx-enterprise-data @@ -224,14 +224,12 @@ slumber==0.7.1 # via edx-rest-api-client sqlparse==0.4.3 # via django -stevedore==4.0.0 +stevedore==4.1.0 # via # edx-django-utils # edx-opaque-keys tqdm==4.64.1 # via -r requirements/base.in -types-cryptography==3.3.23 - # via pyjwt typing-extensions==4.4.0 # via django-countries unicodecsv==0.14.1 @@ -247,5 +245,5 @@ urllib3==1.26.12 # requests webencodings==0.5.1 # via html5lib -zipp==3.9.0 +zipp==3.10.0 # via importlib-metadata diff --git a/requirements/doc.txt b/requirements/doc.txt index ae14b37e..c8f6baf2 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -12,9 +12,9 @@ babel==2.10.3 # via sphinx boto==2.49.0 # via -r requirements/base.in -boto3==1.24.89 +boto3==1.24.96 # via -r requirements/base.in -botocore==1.27.89 +botocore==1.27.96 # via # boto3 # s3transfer @@ -134,7 +134,7 @@ edx-sphinx-theme==3.0.0 # via -r requirements/doc.in factory-boy==3.2.1 # via edx-enterprise-data -faker==15.0.0 +faker==15.1.1 # via factory-boy future==0.18.2 # via pyjwkest @@ -164,7 +164,7 @@ markdown==3.4.1 # via -r requirements/base.in markupsafe==2.1.1 # via jinja2 -newrelic==8.2.0.181 +newrelic==8.2.1 # via edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in @@ -174,9 +174,9 @@ packaging==21.3 # sphinx path==16.5.0 # via -r requirements/doc.in -pbr==5.10.0 +pbr==5.11.0 # via stevedore -psutil==5.9.2 +psutil==5.9.3 # via edx-django-utils pycparser==2.21 # via cffi @@ -186,7 +186,7 @@ pygments==2.13.0 # via sphinx pyjwkest==1.4.2 # via edx-drf-extensions -pyjwt[crypto]==2.5.0 +pyjwt[crypto]==2.6.0 # via # drf-jwt # edx-drf-extensions @@ -204,7 +204,7 @@ python-dateutil==2.8.2 # faker python-memcached==1.59 # via -r requirements/base.in -pytz==2022.4 +pytz==2022.5 # via # babel # django @@ -223,7 +223,7 @@ requests==2.28.1 # sphinx ruamel-yaml==0.17.21 # via drf-yasg -ruamel-yaml-clib==0.2.6 +ruamel-yaml-clib==0.2.7 # via ruamel-yaml rules==3.3 # via edx-enterprise-data @@ -247,7 +247,7 @@ slumber==0.7.1 # via edx-rest-api-client snowballstemmer==2.2.0 # via sphinx -sphinx==5.2.3 +sphinx==5.3.0 # via # -r requirements/doc.in # edx-sphinx-theme @@ -265,14 +265,12 @@ sphinxcontrib-serializinghtml==1.1.5 # via sphinx sqlparse==0.4.3 # via django -stevedore==4.0.0 +stevedore==4.1.0 # via # edx-django-utils # edx-opaque-keys tqdm==4.64.1 # via -r requirements/base.in -types-cryptography==3.3.23 - # via pyjwt typing-extensions==4.4.0 # via django-countries unicodecsv==0.14.1 @@ -288,5 +286,5 @@ urllib3==1.26.12 # requests webencodings==0.5.1 # via html5lib -zipp==3.9.0 +zipp==3.10.0 # via importlib-metadata diff --git a/requirements/pip.txt b/requirements/pip.txt index ae5215b9..9195e7f1 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -8,7 +8,7 @@ wheel==0.37.1 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==22.2.2 +pip==22.3 # via -r requirements/pip.in -setuptools==65.4.1 +setuptools==65.5.0 # via -r requirements/pip.in diff --git a/requirements/production.txt b/requirements/production.txt index 4956e1b4..6b70b872 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -8,9 +8,9 @@ asgiref==3.5.2 # via django boto==2.49.0 # via -r requirements/base.in -boto3==1.24.89 +boto3==1.24.96 # via -r requirements/base.in -botocore==1.27.89 +botocore==1.27.96 # via # boto3 # s3transfer @@ -126,13 +126,13 @@ edx-rest-api-client==5.5.0 # edx-enterprise-data factory-boy==3.2.1 # via edx-enterprise-data -faker==15.0.0 +faker==15.1.1 # via factory-boy future==0.18.2 # via pyjwkest -gevent==22.8.0 +gevent==22.10.1 # via -r requirements/production.in -greenlet==1.1.3 +greenlet==1.1.3.post0 # via gevent gunicorn==20.1.0 # via -r requirements/production.in @@ -158,7 +158,7 @@ markupsafe==2.1.1 # via jinja2 mysqlclient==2.1.1 # via -r requirements/production.in -newrelic==8.2.0.181 +newrelic==8.2.1 # via # -r requirements/production.in # edx-django-utils @@ -168,9 +168,9 @@ packaging==21.3 # via drf-yasg path-py==8.2.1 # via -r requirements/production.in -pbr==5.10.0 +pbr==5.11.0 # via stevedore -psutil==5.9.2 +psutil==5.9.3 # via edx-django-utils pycparser==2.21 # via cffi @@ -178,7 +178,7 @@ pycryptodomex==3.15.0 # via pyjwkest pyjwkest==1.4.2 # via edx-drf-extensions -pyjwt[crypto]==2.5.0 +pyjwt[crypto]==2.6.0 # via # drf-jwt # edx-drf-extensions @@ -196,7 +196,7 @@ python-dateutil==2.8.2 # faker python-memcached==1.59 # via -r requirements/base.in -pytz==2022.4 +pytz==2022.5 # via # django # djangorestframework @@ -215,7 +215,7 @@ requests==2.28.1 # slumber ruamel-yaml==0.17.21 # via drf-yasg -ruamel-yaml-clib==0.2.6 +ruamel-yaml-clib==0.2.7 # via ruamel-yaml rules==3.3 # via edx-enterprise-data @@ -238,14 +238,12 @@ slumber==0.7.1 # via edx-rest-api-client sqlparse==0.4.3 # via django -stevedore==4.0.0 +stevedore==4.1.0 # via # edx-django-utils # edx-opaque-keys tqdm==4.64.1 # via -r requirements/base.in -types-cryptography==3.3.23 - # via pyjwt typing-extensions==4.4.0 # via django-countries unicodecsv==0.14.1 @@ -261,7 +259,7 @@ urllib3==1.26.12 # requests webencodings==0.5.1 # via html5lib -zipp==3.9.0 +zipp==3.10.0 # via importlib-metadata zope-event==4.5.0 # via gevent diff --git a/requirements/test.txt b/requirements/test.txt index bc15348d..e5fe27d2 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -12,9 +12,9 @@ attrs==22.1.0 # via pytest boto==2.49.0 # via -r requirements/base.in -boto3==1.24.89 +boto3==1.24.96 # via -r requirements/base.in -botocore==1.27.89 +botocore==1.27.96 # via # boto3 # s3transfer @@ -141,7 +141,7 @@ edx-rest-api-client==5.5.0 # edx-enterprise-data factory-boy==3.2.1 # via edx-enterprise-data -faker==15.0.0 +faker==15.1.1 # via factory-boy freezegun==1.2.2 # via -r requirements/test.in @@ -177,7 +177,7 @@ markupsafe==2.1.1 # via jinja2 mccabe==0.6.1 # via pylint -newrelic==8.2.0.181 +newrelic==8.2.1 # via edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in @@ -185,13 +185,13 @@ packaging==21.3 # via # drf-yasg # pytest -pbr==5.10.0 +pbr==5.11.0 # via stevedore pluggy==1.0.0 # via # diff-cover # pytest -psutil==5.9.2 +psutil==5.9.3 # via edx-django-utils py==1.11.0 # via pytest @@ -207,7 +207,7 @@ pygments==2.13.0 # via diff-cover pyjwkest==1.4.2 # via edx-drf-extensions -pyjwt[crypto]==2.5.0 +pyjwt[crypto]==2.6.0 # via # drf-jwt # edx-drf-extensions @@ -238,7 +238,7 @@ python-dateutil==2.8.2 # freezegun python-memcached==1.59 # via -r requirements/base.in -pytz==2022.4 +pytz==2022.5 # via # -r requirements/test.in # django @@ -255,11 +255,11 @@ requests==2.28.1 # pyjwkest # responses # slumber -responses==0.21.0 +responses==0.22.0 # via -r requirements/test.in ruamel-yaml==0.17.21 # via drf-yasg -ruamel-yaml-clib==0.2.6 +ruamel-yaml-clib==0.2.7 # via ruamel-yaml rules==3.3 # via edx-enterprise-data @@ -286,18 +286,20 @@ snowballstemmer==2.2.0 # via pydocstyle sqlparse==0.4.3 # via django -stevedore==4.0.0 +stevedore==4.1.0 # via # edx-django-utils # edx-opaque-keys +toml==0.10.2 + # via responses tomli==2.0.1 # via # coverage # pytest tqdm==4.64.1 # via -r requirements/base.in -types-cryptography==3.3.23 - # via pyjwt +types-toml==0.10.8 + # via responses typing-extensions==4.4.0 # via django-countries unicodecsv==0.14.1 @@ -316,5 +318,5 @@ webencodings==0.5.1 # via html5lib wrapt==1.11.2 # via astroid -zipp==3.9.0 +zipp==3.10.0 # via importlib-metadata From 48ed5b5ccb2be2a20cd26fa2d8e6226fd33bc2b0 Mon Sep 17 00:00:00 2001 From: muhammad-ammar Date: Wed, 26 Oct 2022 15:10:19 +0500 Subject: [PATCH 03/11] chore: upgrade edx-enterprise-data to 4.6.4 --- requirements/base.txt | 8 ++++---- requirements/dev.txt | 8 ++++---- requirements/doc.txt | 8 ++++---- requirements/production.txt | 8 ++++---- requirements/test.txt | 14 +++++++------- requirements/tox.txt | 4 ++-- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 5a03906c..32b61bbe 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,9 +8,9 @@ asgiref==3.5.2 # via django boto==2.49.0 # via -r requirements/base.in -boto3==1.24.96 +boto3==1.25.1 # via -r requirements/base.in -botocore==1.27.96 +botocore==1.28.1 # via # boto3 # s3transfer @@ -110,7 +110,7 @@ edx-drf-extensions==8.3.1 # -r requirements/base.in # edx-enterprise-data # edx-rbac -edx-enterprise-data==4.6.3 +edx-enterprise-data==4.6.4 # via -r requirements/base.in edx-opaque-keys==2.3.0 # via @@ -150,7 +150,7 @@ markdown==3.4.1 # via -r requirements/base.in markupsafe==2.1.1 # via jinja2 -newrelic==8.2.1 +newrelic==8.3.0 # via edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in diff --git a/requirements/dev.txt b/requirements/dev.txt index 5a03906c..32b61bbe 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -8,9 +8,9 @@ asgiref==3.5.2 # via django boto==2.49.0 # via -r requirements/base.in -boto3==1.24.96 +boto3==1.25.1 # via -r requirements/base.in -botocore==1.27.96 +botocore==1.28.1 # via # boto3 # s3transfer @@ -110,7 +110,7 @@ edx-drf-extensions==8.3.1 # -r requirements/base.in # edx-enterprise-data # edx-rbac -edx-enterprise-data==4.6.3 +edx-enterprise-data==4.6.4 # via -r requirements/base.in edx-opaque-keys==2.3.0 # via @@ -150,7 +150,7 @@ markdown==3.4.1 # via -r requirements/base.in markupsafe==2.1.1 # via jinja2 -newrelic==8.2.1 +newrelic==8.3.0 # via edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in diff --git a/requirements/doc.txt b/requirements/doc.txt index c8f6baf2..eb7dac32 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -12,9 +12,9 @@ babel==2.10.3 # via sphinx boto==2.49.0 # via -r requirements/base.in -boto3==1.24.96 +boto3==1.25.1 # via -r requirements/base.in -botocore==1.27.96 +botocore==1.28.1 # via # boto3 # s3transfer @@ -116,7 +116,7 @@ edx-drf-extensions==8.3.1 # -r requirements/base.in # edx-enterprise-data # edx-rbac -edx-enterprise-data==4.6.3 +edx-enterprise-data==4.6.4 # via -r requirements/base.in edx-opaque-keys==2.3.0 # via @@ -164,7 +164,7 @@ markdown==3.4.1 # via -r requirements/base.in markupsafe==2.1.1 # via jinja2 -newrelic==8.2.1 +newrelic==8.3.0 # via edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in diff --git a/requirements/production.txt b/requirements/production.txt index 6b70b872..bd244aab 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -8,9 +8,9 @@ asgiref==3.5.2 # via django boto==2.49.0 # via -r requirements/base.in -boto3==1.24.96 +boto3==1.25.1 # via -r requirements/base.in -botocore==1.27.96 +botocore==1.28.1 # via # boto3 # s3transfer @@ -110,7 +110,7 @@ edx-drf-extensions==8.3.1 # -r requirements/base.in # edx-enterprise-data # edx-rbac -edx-enterprise-data==4.6.3 +edx-enterprise-data==4.6.4 # via -r requirements/base.in edx-opaque-keys==2.3.0 # via @@ -158,7 +158,7 @@ markupsafe==2.1.1 # via jinja2 mysqlclient==2.1.1 # via -r requirements/production.in -newrelic==8.2.1 +newrelic==8.3.0 # via # -r requirements/production.in # edx-django-utils diff --git a/requirements/test.txt b/requirements/test.txt index e5fe27d2..018290de 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -12,9 +12,9 @@ attrs==22.1.0 # via pytest boto==2.49.0 # via -r requirements/base.in -boto3==1.24.96 +boto3==1.25.1 # via -r requirements/base.in -botocore==1.27.96 +botocore==1.28.1 # via # boto3 # s3transfer @@ -125,7 +125,7 @@ edx-drf-extensions==8.3.1 # -r requirements/base.in # edx-enterprise-data # edx-rbac -edx-enterprise-data==4.6.3 +edx-enterprise-data==4.6.4 # via -r requirements/base.in edx-opaque-keys==2.3.0 # via @@ -139,6 +139,8 @@ edx-rest-api-client==5.5.0 # via # -r requirements/base.in # edx-enterprise-data +exceptiongroup==1.0.0rc9 + # via pytest factory-boy==3.2.1 # via edx-enterprise-data faker==15.1.1 @@ -177,7 +179,7 @@ markupsafe==2.1.1 # via jinja2 mccabe==0.6.1 # via pylint -newrelic==8.2.1 +newrelic==8.3.0 # via edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in @@ -193,8 +195,6 @@ pluggy==1.0.0 # pytest psutil==5.9.3 # via edx-django-utils -py==1.11.0 - # via pytest pycodestyle==2.9.1 # via -r requirements/test.in pycparser==2.21 @@ -222,7 +222,7 @@ pynacl==1.5.0 # via edx-django-utils pyparsing==3.0.9 # via packaging -pytest==7.1.3 +pytest==7.2.0 # via # pytest-cov # pytest-django diff --git a/requirements/tox.txt b/requirements/tox.txt index cca4fc72..d62f6d9a 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -24,11 +24,11 @@ six==1.16.0 # via tox tomli==2.0.1 # via tox -tox==3.26.0 +tox==3.27.0 # via # -r requirements/tox.in # tox-battery tox-battery==0.6.1 # via -r requirements/tox.in -virtualenv==20.16.5 +virtualenv==20.16.6 # via tox From 49790b777177edeaab1ee6c31cb47c9d896792cf Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Thu, 10 Nov 2022 10:21:37 -0500 Subject: [PATCH 04/11] chore: Updating Python Requirements --- requirements/base.txt | 18 +++++++++--------- requirements/dev.txt | 18 +++++++++--------- requirements/doc.txt | 20 ++++++++++---------- requirements/pip.txt | 6 +++--- requirements/pip_tools.txt | 4 ++-- requirements/production.txt | 24 ++++++++++++------------ requirements/test.txt | 20 ++++++++++---------- requirements/tox.txt | 2 +- 8 files changed, 56 insertions(+), 56 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 32b61bbe..f7abafb8 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,9 +8,9 @@ asgiref==3.5.2 # via django boto==2.49.0 # via -r requirements/base.in -boto3==1.25.1 +boto3==1.26.6 # via -r requirements/base.in -botocore==1.28.1 +botocore==1.29.6 # via # boto3 # s3transfer @@ -32,7 +32,7 @@ coreschema==0.0.4 # via # coreapi # drf-yasg -cryptography==38.0.1 +cryptography==38.0.3 # via # django-fernet-fields # pyjwt @@ -126,7 +126,7 @@ edx-rest-api-client==5.5.0 # edx-enterprise-data factory-boy==3.2.1 # via edx-enterprise-data -faker==15.1.1 +faker==15.3.1 # via factory-boy future==0.18.2 # via pyjwkest @@ -150,7 +150,7 @@ markdown==3.4.1 # via -r requirements/base.in markupsafe==2.1.1 # via jinja2 -newrelic==8.3.0 +newrelic==8.4.0 # via edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in @@ -158,7 +158,7 @@ packaging==21.3 # via drf-yasg pbr==5.11.0 # via stevedore -psutil==5.9.3 +psutil==5.9.4 # via edx-django-utils pycparser==2.21 # via cffi @@ -171,7 +171,7 @@ pyjwt[crypto]==2.6.0 # drf-jwt # edx-drf-extensions # edx-rest-api-client -pymongo==3.12.3 +pymongo==3.13.0 # via edx-opaque-keys pynacl==1.5.0 # via edx-django-utils @@ -184,7 +184,7 @@ python-dateutil==2.8.2 # faker python-memcached==1.59 # via -r requirements/base.in -pytz==2022.5 +pytz==2022.6 # via # django # djangorestframework @@ -224,7 +224,7 @@ slumber==0.7.1 # via edx-rest-api-client sqlparse==0.4.3 # via django -stevedore==4.1.0 +stevedore==4.1.1 # via # edx-django-utils # edx-opaque-keys diff --git a/requirements/dev.txt b/requirements/dev.txt index 32b61bbe..f7abafb8 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -8,9 +8,9 @@ asgiref==3.5.2 # via django boto==2.49.0 # via -r requirements/base.in -boto3==1.25.1 +boto3==1.26.6 # via -r requirements/base.in -botocore==1.28.1 +botocore==1.29.6 # via # boto3 # s3transfer @@ -32,7 +32,7 @@ coreschema==0.0.4 # via # coreapi # drf-yasg -cryptography==38.0.1 +cryptography==38.0.3 # via # django-fernet-fields # pyjwt @@ -126,7 +126,7 @@ edx-rest-api-client==5.5.0 # edx-enterprise-data factory-boy==3.2.1 # via edx-enterprise-data -faker==15.1.1 +faker==15.3.1 # via factory-boy future==0.18.2 # via pyjwkest @@ -150,7 +150,7 @@ markdown==3.4.1 # via -r requirements/base.in markupsafe==2.1.1 # via jinja2 -newrelic==8.3.0 +newrelic==8.4.0 # via edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in @@ -158,7 +158,7 @@ packaging==21.3 # via drf-yasg pbr==5.11.0 # via stevedore -psutil==5.9.3 +psutil==5.9.4 # via edx-django-utils pycparser==2.21 # via cffi @@ -171,7 +171,7 @@ pyjwt[crypto]==2.6.0 # drf-jwt # edx-drf-extensions # edx-rest-api-client -pymongo==3.12.3 +pymongo==3.13.0 # via edx-opaque-keys pynacl==1.5.0 # via edx-django-utils @@ -184,7 +184,7 @@ python-dateutil==2.8.2 # faker python-memcached==1.59 # via -r requirements/base.in -pytz==2022.5 +pytz==2022.6 # via # django # djangorestframework @@ -224,7 +224,7 @@ slumber==0.7.1 # via edx-rest-api-client sqlparse==0.4.3 # via django -stevedore==4.1.0 +stevedore==4.1.1 # via # edx-django-utils # edx-opaque-keys diff --git a/requirements/doc.txt b/requirements/doc.txt index eb7dac32..83b22f51 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -8,13 +8,13 @@ alabaster==0.7.12 # via sphinx asgiref==3.5.2 # via django -babel==2.10.3 +babel==2.11.0 # via sphinx boto==2.49.0 # via -r requirements/base.in -boto3==1.25.1 +boto3==1.26.6 # via -r requirements/base.in -botocore==1.28.1 +botocore==1.29.6 # via # boto3 # s3transfer @@ -36,7 +36,7 @@ coreschema==0.0.4 # via # coreapi # drf-yasg -cryptography==38.0.1 +cryptography==38.0.3 # via # django-fernet-fields # pyjwt @@ -134,7 +134,7 @@ edx-sphinx-theme==3.0.0 # via -r requirements/doc.in factory-boy==3.2.1 # via edx-enterprise-data -faker==15.1.1 +faker==15.3.1 # via factory-boy future==0.18.2 # via pyjwkest @@ -164,7 +164,7 @@ markdown==3.4.1 # via -r requirements/base.in markupsafe==2.1.1 # via jinja2 -newrelic==8.3.0 +newrelic==8.4.0 # via edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in @@ -176,7 +176,7 @@ path==16.5.0 # via -r requirements/doc.in pbr==5.11.0 # via stevedore -psutil==5.9.3 +psutil==5.9.4 # via edx-django-utils pycparser==2.21 # via cffi @@ -191,7 +191,7 @@ pyjwt[crypto]==2.6.0 # drf-jwt # edx-drf-extensions # edx-rest-api-client -pymongo==3.12.3 +pymongo==3.13.0 # via edx-opaque-keys pynacl==1.5.0 # via edx-django-utils @@ -204,7 +204,7 @@ python-dateutil==2.8.2 # faker python-memcached==1.59 # via -r requirements/base.in -pytz==2022.5 +pytz==2022.6 # via # babel # django @@ -265,7 +265,7 @@ sphinxcontrib-serializinghtml==1.1.5 # via sphinx sqlparse==0.4.3 # via django -stevedore==4.1.0 +stevedore==4.1.1 # via # edx-django-utils # edx-opaque-keys diff --git a/requirements/pip.txt b/requirements/pip.txt index 9195e7f1..ebe60b6a 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # pip-compile --allow-unsafe --output-file=requirements/pip.txt requirements/pip.in # -wheel==0.37.1 +wheel==0.38.4 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==22.3 +pip==22.3.1 # via -r requirements/pip.in -setuptools==65.5.0 +setuptools==65.5.1 # via -r requirements/pip.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 9105a968..ab830d57 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -4,7 +4,7 @@ # # make upgrade # -build==0.8.0 +build==0.9.0 # via pip-tools click==8.1.3 # via pip-tools @@ -22,7 +22,7 @@ tomli==2.0.1 # via # build # pep517 -wheel==0.37.1 +wheel==0.38.4 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/production.txt b/requirements/production.txt index bd244aab..f53ba180 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -8,9 +8,9 @@ asgiref==3.5.2 # via django boto==2.49.0 # via -r requirements/base.in -boto3==1.25.1 +boto3==1.26.6 # via -r requirements/base.in -botocore==1.28.1 +botocore==1.29.6 # via # boto3 # s3transfer @@ -32,7 +32,7 @@ coreschema==0.0.4 # via # coreapi # drf-yasg -cryptography==38.0.1 +cryptography==38.0.3 # via # django-fernet-fields # pyjwt @@ -126,13 +126,13 @@ edx-rest-api-client==5.5.0 # edx-enterprise-data factory-boy==3.2.1 # via edx-enterprise-data -faker==15.1.1 +faker==15.3.1 # via factory-boy future==0.18.2 # via pyjwkest -gevent==22.10.1 +gevent==22.10.2 # via -r requirements/production.in -greenlet==1.1.3.post0 +greenlet==2.0.1 # via gevent gunicorn==20.1.0 # via -r requirements/production.in @@ -158,7 +158,7 @@ markupsafe==2.1.1 # via jinja2 mysqlclient==2.1.1 # via -r requirements/production.in -newrelic==8.3.0 +newrelic==8.4.0 # via # -r requirements/production.in # edx-django-utils @@ -170,7 +170,7 @@ path-py==8.2.1 # via -r requirements/production.in pbr==5.11.0 # via stevedore -psutil==5.9.3 +psutil==5.9.4 # via edx-django-utils pycparser==2.21 # via cffi @@ -183,7 +183,7 @@ pyjwt[crypto]==2.6.0 # drf-jwt # edx-drf-extensions # edx-rest-api-client -pymongo==3.12.3 +pymongo==3.13.0 # via edx-opaque-keys pynacl==1.5.0 # via edx-django-utils @@ -196,7 +196,7 @@ python-dateutil==2.8.2 # faker python-memcached==1.59 # via -r requirements/base.in -pytz==2022.5 +pytz==2022.6 # via # django # djangorestframework @@ -238,7 +238,7 @@ slumber==0.7.1 # via edx-rest-api-client sqlparse==0.4.3 # via django -stevedore==4.1.0 +stevedore==4.1.1 # via # edx-django-utils # edx-opaque-keys @@ -263,7 +263,7 @@ zipp==3.10.0 # via importlib-metadata zope-event==4.5.0 # via gevent -zope-interface==5.5.0 +zope-interface==5.5.1 # via gevent # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.txt b/requirements/test.txt index 018290de..4100182e 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -12,9 +12,9 @@ attrs==22.1.0 # via pytest boto==2.49.0 # via -r requirements/base.in -boto3==1.25.1 +boto3==1.26.6 # via -r requirements/base.in -botocore==1.28.1 +botocore==1.29.6 # via # boto3 # s3transfer @@ -42,7 +42,7 @@ coverage[toml]==6.5.0 # via # -r requirements/test.in # pytest-cov -cryptography==38.0.1 +cryptography==38.0.3 # via # django-fernet-fields # pyjwt @@ -139,11 +139,11 @@ edx-rest-api-client==5.5.0 # via # -r requirements/base.in # edx-enterprise-data -exceptiongroup==1.0.0rc9 +exceptiongroup==1.0.1 # via pytest factory-boy==3.2.1 # via edx-enterprise-data -faker==15.1.1 +faker==15.3.1 # via factory-boy freezegun==1.2.2 # via -r requirements/test.in @@ -179,7 +179,7 @@ markupsafe==2.1.1 # via jinja2 mccabe==0.6.1 # via pylint -newrelic==8.3.0 +newrelic==8.4.0 # via edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in @@ -193,7 +193,7 @@ pluggy==1.0.0 # via # diff-cover # pytest -psutil==5.9.3 +psutil==5.9.4 # via edx-django-utils pycodestyle==2.9.1 # via -r requirements/test.in @@ -216,7 +216,7 @@ pylint==2.4.4 # via # -c requirements/constraints.txt # -r requirements/test.in -pymongo==3.12.3 +pymongo==3.13.0 # via edx-opaque-keys pynacl==1.5.0 # via edx-django-utils @@ -238,7 +238,7 @@ python-dateutil==2.8.2 # freezegun python-memcached==1.59 # via -r requirements/base.in -pytz==2022.5 +pytz==2022.6 # via # -r requirements/test.in # django @@ -286,7 +286,7 @@ snowballstemmer==2.2.0 # via pydocstyle sqlparse==0.4.3 # via django -stevedore==4.1.0 +stevedore==4.1.1 # via # edx-django-utils # edx-opaque-keys diff --git a/requirements/tox.txt b/requirements/tox.txt index d62f6d9a..731e99bb 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -12,7 +12,7 @@ filelock==3.8.0 # virtualenv packaging==21.3 # via tox -platformdirs==2.5.2 +platformdirs==2.5.3 # via virtualenv pluggy==1.0.0 # via tox From 41b3caf0cf0aa9b3f618b878779c7b066803022d Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Thu, 24 Nov 2022 10:21:36 -0500 Subject: [PATCH 05/11] chore: Updating Python Requirements --- requirements/base.txt | 12 ++++++------ requirements/ci.txt | 2 +- requirements/dev.txt | 12 ++++++------ requirements/doc.txt | 12 ++++++------ requirements/pip.txt | 2 +- requirements/pip_tools.txt | 2 +- requirements/production.txt | 14 +++++++------- requirements/test.txt | 20 ++++++++++---------- requirements/tox.txt | 6 +++--- 9 files changed, 41 insertions(+), 41 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index f7abafb8..402b55f1 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,9 +8,9 @@ asgiref==3.5.2 # via django boto==2.49.0 # via -r requirements/base.in -boto3==1.26.6 +boto3==1.26.16 # via -r requirements/base.in -botocore==1.29.6 +botocore==1.29.16 # via # boto3 # s3transfer @@ -67,7 +67,7 @@ django-fernet-fields==0.6 # via edx-enterprise-data django-filter==22.1 # via edx-enterprise-data -django-model-utils==4.2.0 +django-model-utils==4.3.1 # via # edx-enterprise-data # edx-rbac @@ -126,7 +126,7 @@ edx-rest-api-client==5.5.0 # edx-enterprise-data factory-boy==3.2.1 # via edx-enterprise-data -faker==15.3.1 +faker==15.3.3 # via factory-boy future==0.18.2 # via pyjwkest @@ -134,7 +134,7 @@ html5lib==1.1 # via -r requirements/base.in idna==3.4 # via requests -importlib-metadata==5.0.0 +importlib-metadata==5.1.0 # via markdown inflection==0.5.1 # via drf-yasg @@ -238,7 +238,7 @@ uritemplate==4.1.1 # via # coreapi # drf-yasg -urllib3==1.26.12 +urllib3==1.26.13 # via # -r requirements/base.in # botocore diff --git a/requirements/ci.txt b/requirements/ci.txt index f18b0b78..1b27a238 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -16,5 +16,5 @@ idna==3.4 # via requests requests==2.28.1 # via codecov -urllib3==1.26.12 +urllib3==1.26.13 # via requests diff --git a/requirements/dev.txt b/requirements/dev.txt index f7abafb8..402b55f1 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -8,9 +8,9 @@ asgiref==3.5.2 # via django boto==2.49.0 # via -r requirements/base.in -boto3==1.26.6 +boto3==1.26.16 # via -r requirements/base.in -botocore==1.29.6 +botocore==1.29.16 # via # boto3 # s3transfer @@ -67,7 +67,7 @@ django-fernet-fields==0.6 # via edx-enterprise-data django-filter==22.1 # via edx-enterprise-data -django-model-utils==4.2.0 +django-model-utils==4.3.1 # via # edx-enterprise-data # edx-rbac @@ -126,7 +126,7 @@ edx-rest-api-client==5.5.0 # edx-enterprise-data factory-boy==3.2.1 # via edx-enterprise-data -faker==15.3.1 +faker==15.3.3 # via factory-boy future==0.18.2 # via pyjwkest @@ -134,7 +134,7 @@ html5lib==1.1 # via -r requirements/base.in idna==3.4 # via requests -importlib-metadata==5.0.0 +importlib-metadata==5.1.0 # via markdown inflection==0.5.1 # via drf-yasg @@ -238,7 +238,7 @@ uritemplate==4.1.1 # via # coreapi # drf-yasg -urllib3==1.26.12 +urllib3==1.26.13 # via # -r requirements/base.in # botocore diff --git a/requirements/doc.txt b/requirements/doc.txt index 83b22f51..11d533d8 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -12,9 +12,9 @@ babel==2.11.0 # via sphinx boto==2.49.0 # via -r requirements/base.in -boto3==1.26.6 +boto3==1.26.16 # via -r requirements/base.in -botocore==1.29.6 +botocore==1.29.16 # via # boto3 # s3transfer @@ -71,7 +71,7 @@ django-fernet-fields==0.6 # via edx-enterprise-data django-filter==22.1 # via edx-enterprise-data -django-model-utils==4.2.0 +django-model-utils==4.3.1 # via # edx-enterprise-data # edx-rbac @@ -134,7 +134,7 @@ edx-sphinx-theme==3.0.0 # via -r requirements/doc.in factory-boy==3.2.1 # via edx-enterprise-data -faker==15.3.1 +faker==15.3.3 # via factory-boy future==0.18.2 # via pyjwkest @@ -144,7 +144,7 @@ idna==3.4 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==5.0.0 +importlib-metadata==5.1.0 # via # markdown # sphinx @@ -279,7 +279,7 @@ uritemplate==4.1.1 # via # coreapi # drf-yasg -urllib3==1.26.12 +urllib3==1.26.13 # via # -r requirements/base.in # botocore diff --git a/requirements/pip.txt b/requirements/pip.txt index ebe60b6a..9ab6eb95 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -10,5 +10,5 @@ wheel==0.38.4 # The following packages are considered to be unsafe in a requirements file: pip==22.3.1 # via -r requirements/pip.in -setuptools==65.5.1 +setuptools==65.6.3 # via -r requirements/pip.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index ab830d57..41e1b623 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -12,7 +12,7 @@ packaging==21.3 # via build pep517==0.13.0 # via build -pip-tools==6.9.0 +pip-tools==6.10.0 # via -r requirements/pip_tools.in pyparsing==3.0.9 # via packaging diff --git a/requirements/production.txt b/requirements/production.txt index f53ba180..a746d0d0 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -8,9 +8,9 @@ asgiref==3.5.2 # via django boto==2.49.0 # via -r requirements/base.in -boto3==1.26.6 +boto3==1.26.16 # via -r requirements/base.in -botocore==1.29.6 +botocore==1.29.16 # via # boto3 # s3transfer @@ -67,7 +67,7 @@ django-fernet-fields==0.6 # via edx-enterprise-data django-filter==22.1 # via edx-enterprise-data -django-model-utils==4.2.0 +django-model-utils==4.3.1 # via # edx-enterprise-data # edx-rbac @@ -126,7 +126,7 @@ edx-rest-api-client==5.5.0 # edx-enterprise-data factory-boy==3.2.1 # via edx-enterprise-data -faker==15.3.1 +faker==15.3.3 # via factory-boy future==0.18.2 # via pyjwkest @@ -140,7 +140,7 @@ html5lib==1.1 # via -r requirements/base.in idna==3.4 # via requests -importlib-metadata==5.0.0 +importlib-metadata==5.1.0 # via markdown inflection==0.5.1 # via drf-yasg @@ -252,7 +252,7 @@ uritemplate==4.1.1 # via # coreapi # drf-yasg -urllib3==1.26.12 +urllib3==1.26.13 # via # -r requirements/base.in # botocore @@ -263,7 +263,7 @@ zipp==3.10.0 # via importlib-metadata zope-event==4.5.0 # via gevent -zope-interface==5.5.1 +zope-interface==5.5.2 # via gevent # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.txt b/requirements/test.txt index 4100182e..ae34e691 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -12,9 +12,9 @@ attrs==22.1.0 # via pytest boto==2.49.0 # via -r requirements/base.in -boto3==1.26.6 +boto3==1.26.16 # via -r requirements/base.in -botocore==1.29.6 +botocore==1.29.16 # via # boto3 # s3transfer @@ -48,7 +48,7 @@ cryptography==38.0.3 # pyjwt ddt==1.6.0 # via -r requirements/test.in -diff-cover==7.0.1 +diff-cover==7.0.2 # via -r requirements/test.in # via # -c requirements/constraints.txt @@ -82,7 +82,7 @@ django-fernet-fields==0.6 # via edx-enterprise-data django-filter==22.1 # via edx-enterprise-data -django-model-utils==4.2.0 +django-model-utils==4.3.1 # via # edx-enterprise-data # edx-rbac @@ -139,11 +139,11 @@ edx-rest-api-client==5.5.0 # via # -r requirements/base.in # edx-enterprise-data -exceptiongroup==1.0.1 +exceptiongroup==1.0.4 # via pytest factory-boy==3.2.1 # via edx-enterprise-data -faker==15.3.1 +faker==15.3.3 # via factory-boy freezegun==1.2.2 # via -r requirements/test.in @@ -153,7 +153,7 @@ html5lib==1.1 # via -r requirements/base.in idna==3.4 # via requests -importlib-metadata==5.0.0 +importlib-metadata==5.1.0 # via markdown inflection==0.5.1 # via drf-yasg @@ -195,7 +195,7 @@ pluggy==1.0.0 # pytest psutil==5.9.4 # via edx-django-utils -pycodestyle==2.9.1 +pycodestyle==2.10.0 # via -r requirements/test.in pycparser==2.21 # via cffi @@ -298,7 +298,7 @@ tomli==2.0.1 # pytest tqdm==4.64.1 # via -r requirements/base.in -types-toml==0.10.8 +types-toml==0.10.8.1 # via responses typing-extensions==4.4.0 # via django-countries @@ -308,7 +308,7 @@ uritemplate==4.1.1 # via # coreapi # drf-yasg -urllib3==1.26.12 +urllib3==1.26.13 # via # -r requirements/base.in # botocore diff --git a/requirements/tox.txt b/requirements/tox.txt index 731e99bb..235b4e1c 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -12,7 +12,7 @@ filelock==3.8.0 # virtualenv packaging==21.3 # via tox -platformdirs==2.5.3 +platformdirs==2.5.4 # via virtualenv pluggy==1.0.0 # via tox @@ -24,11 +24,11 @@ six==1.16.0 # via tox tomli==2.0.1 # via tox -tox==3.27.0 +tox==3.27.1 # via # -r requirements/tox.in # tox-battery tox-battery==0.6.1 # via -r requirements/tox.in -virtualenv==20.16.6 +virtualenv==20.16.7 # via tox From d25ac1b115198d35dff83d6678f26b8f76cfa4b4 Mon Sep 17 00:00:00 2001 From: Mohammad Ahtasham ul Hassan <60315450+aht007@users.noreply.github.com> Date: Thu, 1 Dec 2022 14:03:37 +0500 Subject: [PATCH 06/11] feat: Native Dockerfile (#580) * feat: analyticsapi config for native image --- .dockerignore | 1 + .github/docker-compose-ci.yml | 2 +- .github/workflows/ci.yml | 4 +- .github/workflows/docker-publish.yml | 20 ------ .github/workflows/push-docker-images.yml | 52 ++++++++++++++ .gitignore | 3 + Dockerfile | 87 ++++++++++++++++++------ Makefile | 17 ----- requirements/dev.in | 1 + requirements/dev.txt | 2 + 10 files changed, 127 insertions(+), 62 deletions(-) create mode 100644 .dockerignore delete mode 100644 .github/workflows/docker-publish.yml create mode 100644 .github/workflows/push-docker-images.yml diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..94143827 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +Dockerfile diff --git a/.github/docker-compose-ci.yml b/.github/docker-compose-ci.yml index e0c6ee46..21d29508 100644 --- a/.github/docker-compose-ci.yml +++ b/.github/docker-compose-ci.yml @@ -3,7 +3,7 @@ version: "2" services: analytics_api: - image: edxops/analytics_api:latest + image: edxops/analytics-api-dev:latest container_name: analytics_api_testing volumes: - ..:/edx/app/analytics_api/analytics_api diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ac99c887..673f96e4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,9 +21,9 @@ jobs: targets: [ 'quality','main.test','docs' ] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: setup python - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml deleted file mode 100644 index 142977a8..00000000 --- a/.github/workflows/docker-publish.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Push Docker Images - -on: - push: - branches: - - master -jobs: - push: - runs-on: ubuntu-latest - if: github.event_name == 'push' - - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Build and Push docker image - env: - DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - run : make docker_push diff --git a/.github/workflows/push-docker-images.yml b/.github/workflows/push-docker-images.yml new file mode 100644 index 00000000..efad3827 --- /dev/null +++ b/.github/workflows/push-docker-images.yml @@ -0,0 +1,52 @@ +name: Build and Push Docker Images + +on: + push: + branches: + - master + tags: + - open-release/* +jobs: + push: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v2 + + # Use the release name as the image tag if we're building an open release tag. + # Examples: if we're building 'open-release/maple.1', tag the image as 'maple.1'. + # Otherwise, we must be building from a push to master, so use 'latest'. + - name: Get tag name + id: get-tag-name + uses: actions/github-script@v5 + with: + script: | + const releasePrefix = 'refs/tags/open-release/'; + const tagName = context.ref.split(releasePrefix)[1] || 'latest'; + console.log('Will use tag: ' + tagName); + return tagName; + result-encoding: string + + - name: Build and push Dev Docker image + uses: docker/build-push-action@v1 + with: + push: true + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + target: dev + repository: edxops/analytics-api-dev + tags: ${{ steps.get-tag-name.outputs.result }},${{ github.sha }} + + # This part is commented out for now as edxops/insights is the older image built using Ansible. + # For smooth transition we want to keep that image intact too. Apart from this, the current priority is to get + # the devstack off of Ansible based Images. + # - name: Build and push prod Docker image + # uses: docker/build-push-action@v1 + # with: + # push: true + # username: ${{ secrets.DOCKERHUB_USERNAME }} + # password: ${{ secrets.DOCKERHUB_PASSWORD }} + # target: prod + # repository: edxops/insights + # tags: ${{ steps.get-tag-name.outputs.result }},${{ github.sha }} diff --git a/.gitignore b/.gitignore index 6b33699c..01964783 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,6 @@ elasticsearch-* # Visual Studio Code .vscode + +#Pyenv +.python-version diff --git a/Dockerfile b/Dockerfile index 7e58ca31..71201ef7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,34 +1,77 @@ -FROM ubuntu:focal as app +FROM ubuntu:focal as base +# System requirements. RUN apt update && \ - apt-get install -y software-properties-common && \ - apt-add-repository -y ppa:deadsnakes/ppa && apt-get update && \ - apt install -y git-core language-pack-en python3.8-dev python3.8-venv libmysqlclient-dev libffi-dev libssl-dev build-essential gettext openjdk-8-jdk && \ + apt-get install -qy \ + curl \ + vim \ + language-pack-en \ + build-essential \ + python3.8-dev \ + python3-virtualenv \ + python3.8-distutils \ + libmysqlclient-dev \ + libssl-dev && \ rm -rf /var/lib/apt/lists/* -ENV VIRTUAL_ENV=/venv -RUN python3.8 -m venv $VIRTUAL_ENV -ENV PATH="$VIRTUAL_ENV/bin:$PATH" - -RUN pip install pip==20.2.3 setuptools==50.3.0 - +# Use UTF-8. RUN locale-gen en_US.UTF-8 ENV LANG en_US.UTF-8 ENV LANGUAGE en_US:en ENV LC_ALL en_US.UTF-8 -ENV ANALYTICS_API_CFG /edx/etc/analytics_api.yml -WORKDIR /edx/app/analytics_api -COPY requirements /edx/app/analytics_api/requirements -RUN pip install -r requirements/production.txt +ARG COMMON_APP_DIR="/edx/app" +ARG ANALYTICS_API_SERVICE_NAME="analytics_api" +ENV ANALYTICS_API_HOME "${COMMON_APP_DIR}/${ANALYTICS_API_SERVICE_NAME}" +ARG ANALYTICS_API_APP_DIR="${COMMON_APP_DIR}/${ANALYTICS_API_SERVICE_NAME}" +ARG ANALYTICS_API_VENV_DIR="${COMMON_APP_DIR}/${ANALYTICS_API_SERVICE_NAME}/venvs/${ANALYTICS_API_SERVICE_NAME}" +ARG ANALYTICS_API_CODE_DIR="${ANALYTICS_API_APP_DIR}/${ANALYTICS_API_SERVICE_NAME}" + +ENV ANALYTICS_API_CODE_DIR="${ANALYTICS_API_CODE_DIR}" +ENV PATH "${ANALYTICS_API_VENV_DIR}/bin:$PATH" +ENV COMMON_CFG_DIR "/edx/etc" +ENV ANALYTICS_API_CFG "/edx/etc/${ANALYTICS_API_SERVICE_NAME}.yml" + +# Working directory will be root of repo. +WORKDIR ${ANALYTICS_API_CODE_DIR} + +RUN virtualenv -p python3.8 --always-copy ${ANALYTICS_API_VENV_DIR} + +# Expose canonical Analytics port +EXPOSE 19001 + +FROM base as prod + +ENV DJANGO_SETTINGS_MODULE "analyticsdataserver.settings.production" + +COPY requirements/production.txt ${ANALYTICS_API_CODE_DIR}/requirements/production.txt + +RUN pip install -r ${ANALYTICS_API_CODE_DIR}/requirements/production.txt + +# Copy over rest of code. +# We do this AFTER requirements so that the requirements cache isn't busted +# every time any bit of code is changed. + +COPY . . + +# exec /edx/app/analytics_api/venvs/analytics_api/bin/gunicorn -c /edx/app/analytics_api/analytics_api_gunicorn.py analyticsdataserver.wsgi:application + +CMD ["gunicorn" , "-b", "0.0.0.0:8100", "--pythonpath", "/edx/app/analytics_api/analytics_api","analyticsdataserver.wsgi:application"] + +FROM base as dev + +ENV DJANGO_SETTINGS_MODULE "analyticsdataserver.settings.devstack" + +COPY requirements/dev.txt ${ANALYTICS_API_CODE_DIR}/requirements/dev.txt + +RUN pip install -r ${ANALYTICS_API_CODE_DIR}/requirements/dev.txt -EXPOSE 8100 -CMD gunicorn --bind=0.0.0.0:8100 --workers 2 --max-requests=1000 -c /edx/app/analytics_api/analytics_data_api/docker_gunicorn_configuration.py analyticsdataserver.wsgi:application +# Copy over rest of code. +# We do this AFTER requirements so that the requirements cache isn't busted +# every time any bit of code is changed. +COPY . . -RUN useradd -m --shell /bin/false app -USER app -COPY . /edx/app/analytics_api +# Devstack related step for backwards compatibility +RUN touch /edx/app/${ANALYTICS_API_SERVICE_NAME}/${ANALYTICS_API_SERVICE_NAME}_env -FROM app as newrelic -RUN pip install newrelic -CMD newrelic-admin run-program gunicorn --bind=0.0.0.0:8100 --workers 2 --max-requests=1000 -c /edx/app/analytics_api/analytics_data_api/docker_gunicorn_configuration.py analyticsdataserver.wsgi:application +CMD while true; do python ./manage.py runserver 0.0.0.0:8110; sleep 2; done diff --git a/Makefile b/Makefile index 0421c4cc..181c8f0f 100644 --- a/Makefile +++ b/Makefile @@ -120,22 +120,5 @@ github_ci: test.requirements clean migrate-all ## Used by CI for testing python manage.py generate_fake_course_data --database=analytics --num-weeks=2 --no-videos --course-id "edX/DemoX/Demo_Course" python manage.py generate_fake_course_data --database=analytics_v1 --num-weeks=2 --no-videos --course-id "edX/DemoX/Demo_Course" -docker_build: - docker build . -f Dockerfile -t openedx/analytics-data-api - docker build . -f Dockerfile --target newrelic -t openedx/analytics-data-api:latest-newrelic - -docker_tag: docker_build - docker tag openedx/analytics-data-api openedx/analytics-data-api:${GITHUB_SHA} - docker tag openedx/analytics-data-api:latest-newrelic openedx/analytics-data-api:${GITHUB_SHA}-newrelic - -docker_auth: - echo "$$DOCKERHUB_PASSWORD" | docker login -u "$$DOCKERHUB_USERNAME" --password-stdin - -docker_push: docker_tag docker_auth ## push to docker hub - docker push 'openedx/analytics-data-api:latest' - docker push "openedx/analytics-data-api:${GITHUB_SHA}" - docker push 'openedx/analytics-data-api:latest-newrelic' - docker push "openedx/analytics-data-api:${GITHUB_SHA}-newrelic" - docs: tox.requirements tox -e docs diff --git a/requirements/dev.in b/requirements/dev.in index abfb2005..0c6a6795 100644 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -1,3 +1,4 @@ # Local development dependencies go here -r base.in # Core dependencies of edx-analytics-data-api +mysqlclient diff --git a/requirements/dev.txt b/requirements/dev.txt index f7abafb8..98f4c9a9 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -150,6 +150,8 @@ markdown==3.4.1 # via -r requirements/base.in markupsafe==2.1.1 # via jinja2 +mysqlclient==2.1.1 + # via -r requirements/dev.in newrelic==8.4.0 # via edx-django-utils ordered-set==4.1.0 From 29c8664c0c0de8238bbe5027b9f029f8ff7ada9e Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sat, 10 Dec 2022 10:20:42 -0500 Subject: [PATCH 07/11] chore: Updating Python Requirements --- requirements/base.txt | 24 +++++++++++------------ requirements/ci.txt | 6 +++--- requirements/dev.txt | 24 +++++++++++------------ requirements/doc.txt | 26 ++++++++++++------------- requirements/pip_tools.txt | 6 ++---- requirements/production.txt | 24 +++++++++++------------ requirements/test.txt | 28 +++++++++++++-------------- requirements/tox.txt | 38 ++++++++++++++++++++++--------------- 8 files changed, 86 insertions(+), 90 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 402b55f1..799dcd4c 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # @@ -8,13 +8,13 @@ asgiref==3.5.2 # via django boto==2.49.0 # via -r requirements/base.in -boto3==1.26.16 +boto3==1.26.27 # via -r requirements/base.in -botocore==1.29.16 +botocore==1.29.27 # via # boto3 # s3transfer -certifi==2022.9.24 +certifi==2022.12.7 # via requests cffi==1.15.1 # via @@ -32,7 +32,7 @@ coreschema==0.0.4 # via # coreapi # drf-yasg -cryptography==38.0.3 +cryptography==38.0.4 # via # django-fernet-fields # pyjwt @@ -126,7 +126,7 @@ edx-rest-api-client==5.5.0 # edx-enterprise-data factory-boy==3.2.1 # via edx-enterprise-data -faker==15.3.3 +faker==15.3.4 # via factory-boy future==0.18.2 # via pyjwkest @@ -150,11 +150,11 @@ markdown==3.4.1 # via -r requirements/base.in markupsafe==2.1.1 # via jinja2 -newrelic==8.4.0 +newrelic==8.5.0 # via edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in -packaging==21.3 +packaging==22.0 # via drf-yasg pbr==5.11.0 # via stevedore @@ -162,7 +162,7 @@ psutil==5.9.4 # via edx-django-utils pycparser==2.21 # via cffi -pycryptodomex==3.15.0 +pycryptodomex==3.16.0 # via pyjwkest pyjwkest==1.4.2 # via edx-drf-extensions @@ -175,8 +175,6 @@ pymongo==3.13.0 # via edx-opaque-keys pynacl==1.5.0 # via edx-django-utils -pyparsing==3.0.9 - # via packaging python-dateutil==2.8.2 # via # botocore @@ -245,5 +243,5 @@ urllib3==1.26.13 # requests webencodings==0.5.1 # via html5lib -zipp==3.10.0 +zipp==3.11.0 # via importlib-metadata diff --git a/requirements/ci.txt b/requirements/ci.txt index 1b27a238..c0c02b80 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -1,10 +1,10 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # -certifi==2022.9.24 +certifi==2022.12.7 # via requests charset-normalizer==2.1.1 # via requests diff --git a/requirements/dev.txt b/requirements/dev.txt index e2638119..12279875 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # @@ -8,13 +8,13 @@ asgiref==3.5.2 # via django boto==2.49.0 # via -r requirements/base.in -boto3==1.26.16 +boto3==1.26.27 # via -r requirements/base.in -botocore==1.29.16 +botocore==1.29.27 # via # boto3 # s3transfer -certifi==2022.9.24 +certifi==2022.12.7 # via requests cffi==1.15.1 # via @@ -32,7 +32,7 @@ coreschema==0.0.4 # via # coreapi # drf-yasg -cryptography==38.0.3 +cryptography==38.0.4 # via # django-fernet-fields # pyjwt @@ -126,7 +126,7 @@ edx-rest-api-client==5.5.0 # edx-enterprise-data factory-boy==3.2.1 # via edx-enterprise-data -faker==15.3.3 +faker==15.3.4 # via factory-boy future==0.18.2 # via pyjwkest @@ -152,11 +152,11 @@ markupsafe==2.1.1 # via jinja2 mysqlclient==2.1.1 # via -r requirements/dev.in -newrelic==8.4.0 +newrelic==8.5.0 # via edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in -packaging==21.3 +packaging==22.0 # via drf-yasg pbr==5.11.0 # via stevedore @@ -164,7 +164,7 @@ psutil==5.9.4 # via edx-django-utils pycparser==2.21 # via cffi -pycryptodomex==3.15.0 +pycryptodomex==3.16.0 # via pyjwkest pyjwkest==1.4.2 # via edx-drf-extensions @@ -177,8 +177,6 @@ pymongo==3.13.0 # via edx-opaque-keys pynacl==1.5.0 # via edx-django-utils -pyparsing==3.0.9 - # via packaging python-dateutil==2.8.2 # via # botocore @@ -247,5 +245,5 @@ urllib3==1.26.13 # requests webencodings==0.5.1 # via html5lib -zipp==3.10.0 +zipp==3.11.0 # via importlib-metadata diff --git a/requirements/doc.txt b/requirements/doc.txt index 11d533d8..6fee8001 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # @@ -12,13 +12,13 @@ babel==2.11.0 # via sphinx boto==2.49.0 # via -r requirements/base.in -boto3==1.26.16 +boto3==1.26.27 # via -r requirements/base.in -botocore==1.29.16 +botocore==1.29.27 # via # boto3 # s3transfer -certifi==2022.9.24 +certifi==2022.12.7 # via requests cffi==1.15.1 # via @@ -36,7 +36,7 @@ coreschema==0.0.4 # via # coreapi # drf-yasg -cryptography==38.0.3 +cryptography==38.0.4 # via # django-fernet-fields # pyjwt @@ -134,7 +134,7 @@ edx-sphinx-theme==3.0.0 # via -r requirements/doc.in factory-boy==3.2.1 # via edx-enterprise-data -faker==15.3.3 +faker==15.3.4 # via factory-boy future==0.18.2 # via pyjwkest @@ -164,15 +164,15 @@ markdown==3.4.1 # via -r requirements/base.in markupsafe==2.1.1 # via jinja2 -newrelic==8.4.0 +newrelic==8.5.0 # via edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in -packaging==21.3 +packaging==22.0 # via # drf-yasg # sphinx -path==16.5.0 +path==16.6.0 # via -r requirements/doc.in pbr==5.11.0 # via stevedore @@ -180,7 +180,7 @@ psutil==5.9.4 # via edx-django-utils pycparser==2.21 # via cffi -pycryptodomex==3.15.0 +pycryptodomex==3.16.0 # via pyjwkest pygments==2.13.0 # via sphinx @@ -195,8 +195,6 @@ pymongo==3.13.0 # via edx-opaque-keys pynacl==1.5.0 # via edx-django-utils -pyparsing==3.0.9 - # via packaging python-dateutil==2.8.2 # via # botocore @@ -286,5 +284,5 @@ urllib3==1.26.13 # requests webencodings==0.5.1 # via html5lib -zipp==3.10.0 +zipp==3.11.0 # via importlib-metadata diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 41e1b623..981f7493 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -8,14 +8,12 @@ build==0.9.0 # via pip-tools click==8.1.3 # via pip-tools -packaging==21.3 +packaging==22.0 # via build pep517==0.13.0 # via build -pip-tools==6.10.0 +pip-tools==6.11.0 # via -r requirements/pip_tools.in -pyparsing==3.0.9 - # via packaging six==1.16.0 # via -r requirements/pip_tools.in tomli==2.0.1 diff --git a/requirements/production.txt b/requirements/production.txt index a746d0d0..a89b164a 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # @@ -8,13 +8,13 @@ asgiref==3.5.2 # via django boto==2.49.0 # via -r requirements/base.in -boto3==1.26.16 +boto3==1.26.27 # via -r requirements/base.in -botocore==1.29.16 +botocore==1.29.27 # via # boto3 # s3transfer -certifi==2022.9.24 +certifi==2022.12.7 # via requests cffi==1.15.1 # via @@ -32,7 +32,7 @@ coreschema==0.0.4 # via # coreapi # drf-yasg -cryptography==38.0.3 +cryptography==38.0.4 # via # django-fernet-fields # pyjwt @@ -126,7 +126,7 @@ edx-rest-api-client==5.5.0 # edx-enterprise-data factory-boy==3.2.1 # via edx-enterprise-data -faker==15.3.3 +faker==15.3.4 # via factory-boy future==0.18.2 # via pyjwkest @@ -158,13 +158,13 @@ markupsafe==2.1.1 # via jinja2 mysqlclient==2.1.1 # via -r requirements/production.in -newrelic==8.4.0 +newrelic==8.5.0 # via # -r requirements/production.in # edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in -packaging==21.3 +packaging==22.0 # via drf-yasg path-py==8.2.1 # via -r requirements/production.in @@ -174,7 +174,7 @@ psutil==5.9.4 # via edx-django-utils pycparser==2.21 # via cffi -pycryptodomex==3.15.0 +pycryptodomex==3.16.0 # via pyjwkest pyjwkest==1.4.2 # via edx-drf-extensions @@ -187,8 +187,6 @@ pymongo==3.13.0 # via edx-opaque-keys pynacl==1.5.0 # via edx-django-utils -pyparsing==3.0.9 - # via packaging python-dateutil==2.8.2 # via # botocore @@ -259,7 +257,7 @@ urllib3==1.26.13 # requests webencodings==0.5.1 # via html5lib -zipp==3.10.0 +zipp==3.11.0 # via importlib-metadata zope-event==4.5.0 # via gevent diff --git a/requirements/test.txt b/requirements/test.txt index ae34e691..1345bfca 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # @@ -12,19 +12,19 @@ attrs==22.1.0 # via pytest boto==2.49.0 # via -r requirements/base.in -boto3==1.26.16 +boto3==1.26.27 # via -r requirements/base.in -botocore==1.29.16 +botocore==1.29.27 # via # boto3 # s3transfer -certifi==2022.9.24 +certifi==2022.12.7 # via requests cffi==1.15.1 # via # cryptography # pynacl -chardet==5.0.0 +chardet==5.1.0 # via diff-cover charset-normalizer==2.1.1 # via requests @@ -42,13 +42,13 @@ coverage[toml]==6.5.0 # via # -r requirements/test.in # pytest-cov -cryptography==38.0.3 +cryptography==38.0.4 # via # django-fernet-fields # pyjwt ddt==1.6.0 # via -r requirements/test.in -diff-cover==7.0.2 +diff-cover==7.3.0 # via -r requirements/test.in # via # -c requirements/constraints.txt @@ -143,7 +143,7 @@ exceptiongroup==1.0.4 # via pytest factory-boy==3.2.1 # via edx-enterprise-data -faker==15.3.3 +faker==15.3.4 # via factory-boy freezegun==1.2.2 # via -r requirements/test.in @@ -179,11 +179,11 @@ markupsafe==2.1.1 # via jinja2 mccabe==0.6.1 # via pylint -newrelic==8.4.0 +newrelic==8.5.0 # via edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in -packaging==21.3 +packaging==22.0 # via # drf-yasg # pytest @@ -199,7 +199,7 @@ pycodestyle==2.10.0 # via -r requirements/test.in pycparser==2.21 # via cffi -pycryptodomex==3.15.0 +pycryptodomex==3.16.0 # via pyjwkest pydocstyle==6.1.1 # via -r requirements/test.in @@ -220,8 +220,6 @@ pymongo==3.13.0 # via edx-opaque-keys pynacl==1.5.0 # via edx-django-utils -pyparsing==3.0.9 - # via packaging pytest==7.2.0 # via # pytest-cov @@ -318,5 +316,5 @@ webencodings==0.5.1 # via html5lib wrapt==1.11.2 # via astroid -zipp==3.10.0 +zipp==3.11.0 # via importlib-metadata diff --git a/requirements/tox.txt b/requirements/tox.txt index 235b4e1c..a1e7255c 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -1,34 +1,42 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # +cachetools==5.2.0 + # via tox +chardet==5.1.0 + # via tox +colorama==0.4.6 + # via tox distlib==0.3.6 # via virtualenv -filelock==3.8.0 +filelock==3.8.2 + # via + # tox + # virtualenv +packaging==22.0 + # via + # pyproject-api + # tox +platformdirs==2.6.0 # via # tox # virtualenv -packaging==21.3 - # via tox -platformdirs==2.5.4 - # via virtualenv pluggy==1.0.0 # via tox -py==1.11.0 - # via tox -pyparsing==3.0.9 - # via packaging -six==1.16.0 +pyproject-api==1.2.1 # via tox tomli==2.0.1 - # via tox -tox==3.27.1 + # via + # pyproject-api + # tox +tox==4.0.5 # via # -r requirements/tox.in # tox-battery tox-battery==0.6.1 # via -r requirements/tox.in -virtualenv==20.16.7 +virtualenv==20.17.1 # via tox From a963334eb5113afc3ae82972882d794e7ceeb3ba Mon Sep 17 00:00:00 2001 From: Alie Langston Date: Mon, 12 Dec 2022 08:53:32 -0500 Subject: [PATCH 08/11] fix: add tox constraint to avoid known plugin issue for tox>=4.0.0 --- requirements/base.txt | 2 +- requirements/constraints.txt | 4 ++++ requirements/dev.txt | 2 +- requirements/doc.txt | 2 +- requirements/pip.txt | 4 ++-- requirements/pip_tools.txt | 4 ++-- requirements/production.txt | 2 +- requirements/test.txt | 2 +- requirements/tox.txt | 25 ++++++++----------------- 9 files changed, 21 insertions(+), 26 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 799dcd4c..aa34eed9 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -57,7 +57,7 @@ django==3.2.16 # edx-rbac django-cors-headers==3.13.0 # via -r requirements/base.in -django-countries==7.4.2 +django-countries==7.5 # via -r requirements/base.in django-crum==0.7.9 # via diff --git a/requirements/constraints.txt b/requirements/constraints.txt index de1c0823..363d74cd 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -23,3 +23,7 @@ elasticsearch-dsl>=7.2.1,<8.0.0 # Use same version of edx-lint pylint==2.4.4 pylint-django==2.0.11 + +# 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 diff --git a/requirements/dev.txt b/requirements/dev.txt index 12279875..a164729d 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -57,7 +57,7 @@ django==3.2.16 # edx-rbac django-cors-headers==3.13.0 # via -r requirements/base.in -django-countries==7.4.2 +django-countries==7.5 # via -r requirements/base.in django-crum==0.7.9 # via diff --git a/requirements/doc.txt b/requirements/doc.txt index 6fee8001..b84e5e4b 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -61,7 +61,7 @@ django==3.2.16 # edx-rbac django-cors-headers==3.13.0 # via -r requirements/base.in -django-countries==7.4.2 +django-countries==7.5 # via -r requirements/base.in django-crum==0.7.9 # via diff --git a/requirements/pip.txt b/requirements/pip.txt index 9ab6eb95..02df251c 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # pip-compile --allow-unsafe --output-file=requirements/pip.txt requirements/pip.in # diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 981f7493..5ddec187 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # diff --git a/requirements/production.txt b/requirements/production.txt index a89b164a..371c9256 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -57,7 +57,7 @@ django==3.2.16 # edx-rbac django-cors-headers==3.13.0 # via -r requirements/base.in -django-countries==7.4.2 +django-countries==7.5 # via -r requirements/base.in django-crum==0.7.9 # via diff --git a/requirements/test.txt b/requirements/test.txt index 1345bfca..ae514c86 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -70,7 +70,7 @@ diff-cover==7.3.0 # edx-rbac django-cors-headers==3.13.0 # via -r requirements/base.in -django-countries==7.4.2 +django-countries==7.5 # via -r requirements/base.in django-crum==0.7.9 # via diff --git a/requirements/tox.txt b/requirements/tox.txt index a1e7255c..4398bedc 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -4,12 +4,6 @@ # # make upgrade # -cachetools==5.2.0 - # via tox -chardet==5.1.0 - # via tox -colorama==0.4.6 - # via tox distlib==0.3.6 # via virtualenv filelock==3.8.2 @@ -17,23 +11,20 @@ filelock==3.8.2 # tox # virtualenv packaging==22.0 - # via - # pyproject-api - # tox + # via tox platformdirs==2.6.0 - # via - # tox - # virtualenv + # via virtualenv pluggy==1.0.0 # via tox -pyproject-api==1.2.1 +py==1.11.0 + # via tox +six==1.16.0 # via tox tomli==2.0.1 + # via tox +tox==3.27.1 # via - # pyproject-api - # tox -tox==4.0.5 - # via + # -c requirements/constraints.txt # -r requirements/tox.in # tox-battery tox-battery==0.6.1 From 38546f93806ca6e6532606503fa65d70fa329587 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Tue, 10 Jan 2023 10:22:40 -0500 Subject: [PATCH 09/11] chore: Updating Python Requirements --- requirements/base.txt | 18 +++++++++--------- requirements/ci.txt | 2 +- requirements/dev.txt | 18 +++++++++--------- requirements/doc.txt | 24 ++++++++++++------------ requirements/pip_tools.txt | 4 ++-- requirements/production.txt | 20 ++++++++++---------- requirements/test.txt | 30 +++++++++++++++--------------- requirements/tox.txt | 8 ++++---- 8 files changed, 62 insertions(+), 62 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index aa34eed9..a20e833d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,13 +4,13 @@ # # make upgrade # -asgiref==3.5.2 +asgiref==3.6.0 # via django boto==2.49.0 # via -r requirements/base.in -boto3==1.26.27 +boto3==1.26.46 # via -r requirements/base.in -botocore==1.29.27 +botocore==1.29.46 # via # boto3 # s3transfer @@ -32,7 +32,7 @@ coreschema==0.0.4 # via # coreapi # drf-yasg -cryptography==38.0.4 +cryptography==39.0.0 # via # django-fernet-fields # pyjwt @@ -105,7 +105,7 @@ edx-django-utils==5.2.0 # edx-drf-extensions # edx-enterprise-data # edx-rest-api-client -edx-drf-extensions==8.3.1 +edx-drf-extensions==8.4.0 # via # -r requirements/base.in # edx-enterprise-data @@ -126,7 +126,7 @@ edx-rest-api-client==5.5.0 # edx-enterprise-data factory-boy==3.2.1 # via edx-enterprise-data -faker==15.3.4 +faker==16.1.0 # via factory-boy future==0.18.2 # via pyjwkest @@ -134,7 +134,7 @@ html5lib==1.1 # via -r requirements/base.in idna==3.4 # via requests -importlib-metadata==5.1.0 +importlib-metadata==6.0.0 # via markdown inflection==0.5.1 # via drf-yasg @@ -154,7 +154,7 @@ newrelic==8.5.0 # via edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in -packaging==22.0 +packaging==23.0 # via drf-yasg pbr==5.11.0 # via stevedore @@ -182,7 +182,7 @@ python-dateutil==2.8.2 # faker python-memcached==1.59 # via -r requirements/base.in -pytz==2022.6 +pytz==2022.7 # via # django # djangorestframework diff --git a/requirements/ci.txt b/requirements/ci.txt index c0c02b80..b5ef5714 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -10,7 +10,7 @@ charset-normalizer==2.1.1 # via requests codecov==2.1.12 # via -r requirements/ci.in -coverage==6.5.0 +coverage==7.0.4 # via codecov idna==3.4 # via requests diff --git a/requirements/dev.txt b/requirements/dev.txt index a164729d..96096291 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,13 +4,13 @@ # # make upgrade # -asgiref==3.5.2 +asgiref==3.6.0 # via django boto==2.49.0 # via -r requirements/base.in -boto3==1.26.27 +boto3==1.26.46 # via -r requirements/base.in -botocore==1.29.27 +botocore==1.29.46 # via # boto3 # s3transfer @@ -32,7 +32,7 @@ coreschema==0.0.4 # via # coreapi # drf-yasg -cryptography==38.0.4 +cryptography==39.0.0 # via # django-fernet-fields # pyjwt @@ -105,7 +105,7 @@ edx-django-utils==5.2.0 # edx-drf-extensions # edx-enterprise-data # edx-rest-api-client -edx-drf-extensions==8.3.1 +edx-drf-extensions==8.4.0 # via # -r requirements/base.in # edx-enterprise-data @@ -126,7 +126,7 @@ edx-rest-api-client==5.5.0 # edx-enterprise-data factory-boy==3.2.1 # via edx-enterprise-data -faker==15.3.4 +faker==16.1.0 # via factory-boy future==0.18.2 # via pyjwkest @@ -134,7 +134,7 @@ html5lib==1.1 # via -r requirements/base.in idna==3.4 # via requests -importlib-metadata==5.1.0 +importlib-metadata==6.0.0 # via markdown inflection==0.5.1 # via drf-yasg @@ -156,7 +156,7 @@ newrelic==8.5.0 # via edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in -packaging==22.0 +packaging==23.0 # via drf-yasg pbr==5.11.0 # via stevedore @@ -184,7 +184,7 @@ python-dateutil==2.8.2 # faker python-memcached==1.59 # via -r requirements/base.in -pytz==2022.6 +pytz==2022.7 # via # django # djangorestframework diff --git a/requirements/doc.txt b/requirements/doc.txt index b84e5e4b..6be8afc3 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -6,15 +6,15 @@ # alabaster==0.7.12 # via sphinx -asgiref==3.5.2 +asgiref==3.6.0 # via django babel==2.11.0 # via sphinx boto==2.49.0 # via -r requirements/base.in -boto3==1.26.27 +boto3==1.26.46 # via -r requirements/base.in -botocore==1.29.27 +botocore==1.29.46 # via # boto3 # s3transfer @@ -36,7 +36,7 @@ coreschema==0.0.4 # via # coreapi # drf-yasg -cryptography==38.0.4 +cryptography==39.0.0 # via # django-fernet-fields # pyjwt @@ -111,7 +111,7 @@ edx-django-utils==5.2.0 # edx-drf-extensions # edx-enterprise-data # edx-rest-api-client -edx-drf-extensions==8.3.1 +edx-drf-extensions==8.4.0 # via # -r requirements/base.in # edx-enterprise-data @@ -134,7 +134,7 @@ edx-sphinx-theme==3.0.0 # via -r requirements/doc.in factory-boy==3.2.1 # via edx-enterprise-data -faker==15.3.4 +faker==16.1.0 # via factory-boy future==0.18.2 # via pyjwkest @@ -144,7 +144,7 @@ idna==3.4 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==5.1.0 +importlib-metadata==6.0.0 # via # markdown # sphinx @@ -168,7 +168,7 @@ newrelic==8.5.0 # via edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in -packaging==22.0 +packaging==23.0 # via # drf-yasg # sphinx @@ -182,7 +182,7 @@ pycparser==2.21 # via cffi pycryptodomex==3.16.0 # via pyjwkest -pygments==2.13.0 +pygments==2.14.0 # via sphinx pyjwkest==1.4.2 # via edx-drf-extensions @@ -202,7 +202,7 @@ python-dateutil==2.8.2 # faker python-memcached==1.59 # via -r requirements/base.in -pytz==2022.6 +pytz==2022.7 # via # babel # django @@ -245,11 +245,11 @@ slumber==0.7.1 # via edx-rest-api-client snowballstemmer==2.2.0 # via sphinx -sphinx==5.3.0 +sphinx==6.1.2 # via # -r requirements/doc.in # edx-sphinx-theme -sphinxcontrib-applehelp==1.0.2 +sphinxcontrib-applehelp==1.0.3 # via sphinx sphinxcontrib-devhelp==1.0.2 # via sphinx diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 5ddec187..6574833d 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -8,11 +8,11 @@ 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 -pip-tools==6.11.0 +pip-tools==6.12.1 # via -r requirements/pip_tools.in six==1.16.0 # via -r requirements/pip_tools.in diff --git a/requirements/production.txt b/requirements/production.txt index 371c9256..6a8616de 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -4,13 +4,13 @@ # # make upgrade # -asgiref==3.5.2 +asgiref==3.6.0 # via django boto==2.49.0 # via -r requirements/base.in -boto3==1.26.27 +boto3==1.26.46 # via -r requirements/base.in -botocore==1.29.27 +botocore==1.29.46 # via # boto3 # s3transfer @@ -32,7 +32,7 @@ coreschema==0.0.4 # via # coreapi # drf-yasg -cryptography==38.0.4 +cryptography==39.0.0 # via # django-fernet-fields # pyjwt @@ -105,7 +105,7 @@ edx-django-utils==5.2.0 # edx-drf-extensions # edx-enterprise-data # edx-rest-api-client -edx-drf-extensions==8.3.1 +edx-drf-extensions==8.4.0 # via # -r requirements/base.in # edx-enterprise-data @@ -126,7 +126,7 @@ edx-rest-api-client==5.5.0 # edx-enterprise-data factory-boy==3.2.1 # via edx-enterprise-data -faker==15.3.4 +faker==16.1.0 # via factory-boy future==0.18.2 # via pyjwkest @@ -140,7 +140,7 @@ html5lib==1.1 # via -r requirements/base.in idna==3.4 # via requests -importlib-metadata==5.1.0 +importlib-metadata==6.0.0 # via markdown inflection==0.5.1 # via drf-yasg @@ -164,7 +164,7 @@ newrelic==8.5.0 # edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in -packaging==22.0 +packaging==23.0 # via drf-yasg path-py==8.2.1 # via -r requirements/production.in @@ -194,7 +194,7 @@ python-dateutil==2.8.2 # faker python-memcached==1.59 # via -r requirements/base.in -pytz==2022.6 +pytz==2022.7 # via # django # djangorestframework @@ -259,7 +259,7 @@ webencodings==0.5.1 # via html5lib zipp==3.11.0 # via importlib-metadata -zope-event==4.5.0 +zope-event==4.6 # via gevent zope-interface==5.5.2 # via gevent diff --git a/requirements/test.txt b/requirements/test.txt index ae514c86..1ba92a56 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,17 +4,17 @@ # # make upgrade # -asgiref==3.5.2 +asgiref==3.6.0 # via django astroid==2.3.3 # via pylint -attrs==22.1.0 +attrs==22.2.0 # via pytest boto==2.49.0 # via -r requirements/base.in -boto3==1.26.27 +boto3==1.26.46 # via -r requirements/base.in -botocore==1.29.27 +botocore==1.29.46 # via # boto3 # s3transfer @@ -38,11 +38,11 @@ coreschema==0.0.4 # via # coreapi # drf-yasg -coverage[toml]==6.5.0 +coverage[toml]==7.0.4 # via # -r requirements/test.in # pytest-cov -cryptography==38.0.4 +cryptography==39.0.0 # via # django-fernet-fields # pyjwt @@ -120,7 +120,7 @@ edx-django-utils==5.2.0 # edx-drf-extensions # edx-enterprise-data # edx-rest-api-client -edx-drf-extensions==8.3.1 +edx-drf-extensions==8.4.0 # via # -r requirements/base.in # edx-enterprise-data @@ -139,11 +139,11 @@ edx-rest-api-client==5.5.0 # via # -r requirements/base.in # edx-enterprise-data -exceptiongroup==1.0.4 +exceptiongroup==1.1.0 # via pytest factory-boy==3.2.1 # via edx-enterprise-data -faker==15.3.4 +faker==16.1.0 # via factory-boy freezegun==1.2.2 # via -r requirements/test.in @@ -153,11 +153,11 @@ html5lib==1.1 # via -r requirements/base.in idna==3.4 # via requests -importlib-metadata==5.1.0 +importlib-metadata==6.0.0 # via markdown inflection==0.5.1 # via drf-yasg -iniconfig==1.1.1 +iniconfig==2.0.0 # via pytest isort==4.3.21 # via pylint @@ -183,7 +183,7 @@ newrelic==8.5.0 # via edx-django-utils ordered-set==4.1.0 # via -r requirements/base.in -packaging==22.0 +packaging==23.0 # via # drf-yasg # pytest @@ -201,9 +201,9 @@ pycparser==2.21 # via cffi pycryptodomex==3.16.0 # via pyjwkest -pydocstyle==6.1.1 +pydocstyle==6.2.3 # via -r requirements/test.in -pygments==2.13.0 +pygments==2.14.0 # via diff-cover pyjwkest==1.4.2 # via edx-drf-extensions @@ -236,7 +236,7 @@ python-dateutil==2.8.2 # freezegun python-memcached==1.59 # via -r requirements/base.in -pytz==2022.6 +pytz==2022.7 # via # -r requirements/test.in # django diff --git a/requirements/tox.txt b/requirements/tox.txt index 4398bedc..38696911 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -6,13 +6,13 @@ # distlib==0.3.6 # via virtualenv -filelock==3.8.2 +filelock==3.9.0 # via # tox # virtualenv -packaging==22.0 +packaging==23.0 # via tox -platformdirs==2.6.0 +platformdirs==2.6.2 # via virtualenv pluggy==1.0.0 # via tox @@ -22,7 +22,7 @@ six==1.16.0 # via tox tomli==2.0.1 # via tox -tox==3.27.1 +tox==3.28.0 # via # -c requirements/constraints.txt # -r requirements/tox.in From 0a0dd10764c981eeebc666465c598ad6ace62d56 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Tue, 24 Jan 2023 10:21:22 -0500 Subject: [PATCH 10/11] chore: Updating Python Requirements --- requirements/base.txt | 22 +++++++++++----------- requirements/ci.txt | 8 ++++---- requirements/dev.txt | 22 +++++++++++----------- requirements/doc.txt | 30 +++++++++++++++--------------- requirements/pip.txt | 8 +++----- requirements/pip_tools.txt | 10 ++++------ requirements/production.txt | 22 +++++++++++----------- requirements/test.txt | 30 +++++++++++++++--------------- 8 files changed, 74 insertions(+), 78 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index a20e833d..cf198c9c 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,9 +8,9 @@ asgiref==3.6.0 # via django boto==2.49.0 # via -r requirements/base.in -boto3==1.26.46 +boto3==1.26.55 # via -r requirements/base.in -botocore==1.29.46 +botocore==1.29.55 # via # boto3 # s3transfer @@ -20,7 +20,7 @@ cffi==1.15.1 # via # cryptography # pynacl -charset-normalizer==2.1.1 +charset-normalizer==3.0.1 # via requests click==8.1.3 # via edx-django-utils @@ -105,7 +105,7 @@ edx-django-utils==5.2.0 # edx-drf-extensions # edx-enterprise-data # edx-rest-api-client -edx-drf-extensions==8.4.0 +edx-drf-extensions==8.4.1 # via # -r requirements/base.in # edx-enterprise-data @@ -126,9 +126,9 @@ edx-rest-api-client==5.5.0 # edx-enterprise-data factory-boy==3.2.1 # via edx-enterprise-data -faker==16.1.0 +faker==16.6.0 # via factory-boy -future==0.18.2 +future==0.18.3 # via pyjwkest html5lib==1.1 # via -r requirements/base.in @@ -148,7 +148,7 @@ jmespath==1.0.1 # botocore markdown==3.4.1 # via -r requirements/base.in -markupsafe==2.1.1 +markupsafe==2.1.2 # via jinja2 newrelic==8.5.0 # via edx-django-utils @@ -156,7 +156,7 @@ ordered-set==4.1.0 # via -r requirements/base.in packaging==23.0 # via drf-yasg -pbr==5.11.0 +pbr==5.11.1 # via stevedore psutil==5.9.4 # via edx-django-utils @@ -182,14 +182,14 @@ python-dateutil==2.8.2 # faker python-memcached==1.59 # via -r requirements/base.in -pytz==2022.7 +pytz==2022.7.1 # via # django # djangorestframework # drf-yasg pyyaml==6.0 # via edx-django-release-util -requests==2.28.1 +requests==2.28.2 # via # coreapi # edx-drf-extensions @@ -236,7 +236,7 @@ uritemplate==4.1.1 # via # coreapi # drf-yasg -urllib3==1.26.13 +urllib3==1.26.14 # via # -r requirements/base.in # botocore diff --git a/requirements/ci.txt b/requirements/ci.txt index b5ef5714..19a21bea 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -6,15 +6,15 @@ # certifi==2022.12.7 # via requests -charset-normalizer==2.1.1 +charset-normalizer==3.0.1 # via requests codecov==2.1.12 # via -r requirements/ci.in -coverage==7.0.4 +coverage==7.0.5 # via codecov idna==3.4 # via requests -requests==2.28.1 +requests==2.28.2 # via codecov -urllib3==1.26.13 +urllib3==1.26.14 # via requests diff --git a/requirements/dev.txt b/requirements/dev.txt index 96096291..ed7fa429 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -8,9 +8,9 @@ asgiref==3.6.0 # via django boto==2.49.0 # via -r requirements/base.in -boto3==1.26.46 +boto3==1.26.55 # via -r requirements/base.in -botocore==1.29.46 +botocore==1.29.55 # via # boto3 # s3transfer @@ -20,7 +20,7 @@ cffi==1.15.1 # via # cryptography # pynacl -charset-normalizer==2.1.1 +charset-normalizer==3.0.1 # via requests click==8.1.3 # via edx-django-utils @@ -105,7 +105,7 @@ edx-django-utils==5.2.0 # edx-drf-extensions # edx-enterprise-data # edx-rest-api-client -edx-drf-extensions==8.4.0 +edx-drf-extensions==8.4.1 # via # -r requirements/base.in # edx-enterprise-data @@ -126,9 +126,9 @@ edx-rest-api-client==5.5.0 # edx-enterprise-data factory-boy==3.2.1 # via edx-enterprise-data -faker==16.1.0 +faker==16.6.0 # via factory-boy -future==0.18.2 +future==0.18.3 # via pyjwkest html5lib==1.1 # via -r requirements/base.in @@ -148,7 +148,7 @@ jmespath==1.0.1 # botocore markdown==3.4.1 # via -r requirements/base.in -markupsafe==2.1.1 +markupsafe==2.1.2 # via jinja2 mysqlclient==2.1.1 # via -r requirements/dev.in @@ -158,7 +158,7 @@ ordered-set==4.1.0 # via -r requirements/base.in packaging==23.0 # via drf-yasg -pbr==5.11.0 +pbr==5.11.1 # via stevedore psutil==5.9.4 # via edx-django-utils @@ -184,14 +184,14 @@ python-dateutil==2.8.2 # faker python-memcached==1.59 # via -r requirements/base.in -pytz==2022.7 +pytz==2022.7.1 # via # django # djangorestframework # drf-yasg pyyaml==6.0 # via edx-django-release-util -requests==2.28.1 +requests==2.28.2 # via # coreapi # edx-drf-extensions @@ -238,7 +238,7 @@ uritemplate==4.1.1 # via # coreapi # drf-yasg -urllib3==1.26.13 +urllib3==1.26.14 # via # -r requirements/base.in # botocore diff --git a/requirements/doc.txt b/requirements/doc.txt index 6be8afc3..16dcb2cf 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -4,7 +4,7 @@ # # make upgrade # -alabaster==0.7.12 +alabaster==0.7.13 # via sphinx asgiref==3.6.0 # via django @@ -12,9 +12,9 @@ babel==2.11.0 # via sphinx boto==2.49.0 # via -r requirements/base.in -boto3==1.26.46 +boto3==1.26.55 # via -r requirements/base.in -botocore==1.29.46 +botocore==1.29.55 # via # boto3 # s3transfer @@ -24,7 +24,7 @@ cffi==1.15.1 # via # cryptography # pynacl -charset-normalizer==2.1.1 +charset-normalizer==3.0.1 # via requests click==8.1.3 # via edx-django-utils @@ -111,7 +111,7 @@ edx-django-utils==5.2.0 # edx-drf-extensions # edx-enterprise-data # edx-rest-api-client -edx-drf-extensions==8.4.0 +edx-drf-extensions==8.4.1 # via # -r requirements/base.in # edx-enterprise-data @@ -130,13 +130,13 @@ edx-rest-api-client==5.5.0 # via # -r requirements/base.in # edx-enterprise-data -edx-sphinx-theme==3.0.0 +edx-sphinx-theme==3.1.0 # via -r requirements/doc.in factory-boy==3.2.1 # via edx-enterprise-data -faker==16.1.0 +faker==16.6.0 # via factory-boy -future==0.18.2 +future==0.18.3 # via pyjwkest html5lib==1.1 # via -r requirements/base.in @@ -162,7 +162,7 @@ jmespath==1.0.1 # botocore markdown==3.4.1 # via -r requirements/base.in -markupsafe==2.1.1 +markupsafe==2.1.2 # via jinja2 newrelic==8.5.0 # via edx-django-utils @@ -174,7 +174,7 @@ packaging==23.0 # sphinx path==16.6.0 # via -r requirements/doc.in -pbr==5.11.0 +pbr==5.11.1 # via stevedore psutil==5.9.4 # via edx-django-utils @@ -202,7 +202,7 @@ python-dateutil==2.8.2 # faker python-memcached==1.59 # via -r requirements/base.in -pytz==2022.7 +pytz==2022.7.1 # via # babel # django @@ -210,7 +210,7 @@ pytz==2022.7 # drf-yasg pyyaml==6.0 # via edx-django-release-util -requests==2.28.1 +requests==2.28.2 # via # coreapi # edx-drf-extensions @@ -245,11 +245,11 @@ slumber==0.7.1 # via edx-rest-api-client snowballstemmer==2.2.0 # via sphinx -sphinx==6.1.2 +sphinx==5.3.0 # via # -r requirements/doc.in # edx-sphinx-theme -sphinxcontrib-applehelp==1.0.3 +sphinxcontrib-applehelp==1.0.4 # via sphinx sphinxcontrib-devhelp==1.0.2 # via sphinx @@ -277,7 +277,7 @@ uritemplate==4.1.1 # via # coreapi # drf-yasg -urllib3==1.26.13 +urllib3==1.26.14 # via # -r requirements/base.in # botocore diff --git a/requirements/pip.txt b/requirements/pip.txt index 02df251c..82e1279e 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,9 @@ # # pip-compile --allow-unsafe --output-file=requirements/pip.txt requirements/pip.in # -wheel==0.38.4 - # via -r requirements/pip.in - -# The following packages are considered to be unsafe in a requirements file: pip==22.3.1 # via -r requirements/pip.in -setuptools==65.6.3 +setuptools==66.1.1 + # via -r requirements/pip.in +wheel==0.38.4 # via -r requirements/pip.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 6574833d..0150a928 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -4,22 +4,20 @@ # # make upgrade # -build==0.9.0 +build==0.10.0 # via pip-tools click==8.1.3 # via pip-tools packaging==23.0 # via build -pep517==0.13.0 - # via build pip-tools==6.12.1 # via -r requirements/pip_tools.in +pyproject-hooks==1.0.0 + # via build six==1.16.0 # via -r requirements/pip_tools.in tomli==2.0.1 - # via - # build - # pep517 + # via build wheel==0.38.4 # via pip-tools diff --git a/requirements/production.txt b/requirements/production.txt index 6a8616de..1b683206 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -8,9 +8,9 @@ asgiref==3.6.0 # via django boto==2.49.0 # via -r requirements/base.in -boto3==1.26.46 +boto3==1.26.55 # via -r requirements/base.in -botocore==1.29.46 +botocore==1.29.55 # via # boto3 # s3transfer @@ -20,7 +20,7 @@ cffi==1.15.1 # via # cryptography # pynacl -charset-normalizer==2.1.1 +charset-normalizer==3.0.1 # via requests click==8.1.3 # via edx-django-utils @@ -105,7 +105,7 @@ edx-django-utils==5.2.0 # edx-drf-extensions # edx-enterprise-data # edx-rest-api-client -edx-drf-extensions==8.4.0 +edx-drf-extensions==8.4.1 # via # -r requirements/base.in # edx-enterprise-data @@ -126,9 +126,9 @@ edx-rest-api-client==5.5.0 # edx-enterprise-data factory-boy==3.2.1 # via edx-enterprise-data -faker==16.1.0 +faker==16.6.0 # via factory-boy -future==0.18.2 +future==0.18.3 # via pyjwkest gevent==22.10.2 # via -r requirements/production.in @@ -154,7 +154,7 @@ jmespath==1.0.1 # botocore markdown==3.4.1 # via -r requirements/base.in -markupsafe==2.1.1 +markupsafe==2.1.2 # via jinja2 mysqlclient==2.1.1 # via -r requirements/production.in @@ -168,7 +168,7 @@ packaging==23.0 # via drf-yasg path-py==8.2.1 # via -r requirements/production.in -pbr==5.11.0 +pbr==5.11.1 # via stevedore psutil==5.9.4 # via edx-django-utils @@ -194,7 +194,7 @@ python-dateutil==2.8.2 # faker python-memcached==1.59 # via -r requirements/base.in -pytz==2022.7 +pytz==2022.7.1 # via # django # djangorestframework @@ -203,7 +203,7 @@ pyyaml==6.0 # via # -r requirements/production.in # edx-django-release-util -requests==2.28.1 +requests==2.28.2 # via # coreapi # edx-drf-extensions @@ -250,7 +250,7 @@ uritemplate==4.1.1 # via # coreapi # drf-yasg -urllib3==1.26.13 +urllib3==1.26.14 # via # -r requirements/base.in # botocore diff --git a/requirements/test.txt b/requirements/test.txt index 1ba92a56..c5ed6037 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -12,9 +12,9 @@ attrs==22.2.0 # via pytest boto==2.49.0 # via -r requirements/base.in -boto3==1.26.46 +boto3==1.26.55 # via -r requirements/base.in -botocore==1.29.46 +botocore==1.29.55 # via # boto3 # s3transfer @@ -26,7 +26,7 @@ cffi==1.15.1 # pynacl chardet==5.1.0 # via diff-cover -charset-normalizer==2.1.1 +charset-normalizer==3.0.1 # via requests click==8.1.3 # via edx-django-utils @@ -38,7 +38,7 @@ coreschema==0.0.4 # via # coreapi # drf-yasg -coverage[toml]==7.0.4 +coverage[toml]==7.0.5 # via # -r requirements/test.in # pytest-cov @@ -48,7 +48,7 @@ cryptography==39.0.0 # pyjwt ddt==1.6.0 # via -r requirements/test.in -diff-cover==7.3.0 +diff-cover==7.3.2 # via -r requirements/test.in # via # -c requirements/constraints.txt @@ -120,7 +120,7 @@ edx-django-utils==5.2.0 # edx-drf-extensions # edx-enterprise-data # edx-rest-api-client -edx-drf-extensions==8.4.0 +edx-drf-extensions==8.4.1 # via # -r requirements/base.in # edx-enterprise-data @@ -143,11 +143,11 @@ exceptiongroup==1.1.0 # via pytest factory-boy==3.2.1 # via edx-enterprise-data -faker==16.1.0 +faker==16.6.0 # via factory-boy freezegun==1.2.2 # via -r requirements/test.in -future==0.18.2 +future==0.18.3 # via pyjwkest html5lib==1.1 # via -r requirements/base.in @@ -175,7 +175,7 @@ lazy-object-proxy==1.4.3 # via astroid markdown==3.4.1 # via -r requirements/base.in -markupsafe==2.1.1 +markupsafe==2.1.2 # via jinja2 mccabe==0.6.1 # via pylint @@ -187,7 +187,7 @@ packaging==23.0 # via # drf-yasg # pytest -pbr==5.11.0 +pbr==5.11.1 # via stevedore pluggy==1.0.0 # via @@ -201,7 +201,7 @@ pycparser==2.21 # via cffi pycryptodomex==3.16.0 # via pyjwkest -pydocstyle==6.2.3 +pydocstyle==6.3.0 # via -r requirements/test.in pygments==2.14.0 # via diff-cover @@ -220,7 +220,7 @@ pymongo==3.13.0 # via edx-opaque-keys pynacl==1.5.0 # via edx-django-utils -pytest==7.2.0 +pytest==7.2.1 # via # pytest-cov # pytest-django @@ -236,7 +236,7 @@ python-dateutil==2.8.2 # freezegun python-memcached==1.59 # via -r requirements/base.in -pytz==2022.7 +pytz==2022.7.1 # via # -r requirements/test.in # django @@ -244,7 +244,7 @@ pytz==2022.7 # drf-yasg pyyaml==6.0 # via edx-django-release-util -requests==2.28.1 +requests==2.28.2 # via # coreapi # edx-drf-extensions @@ -306,7 +306,7 @@ uritemplate==4.1.1 # via # coreapi # drf-yasg -urllib3==1.26.13 +urllib3==1.26.14 # via # -r requirements/base.in # botocore From 5d18e70da82787fbc649cbca748a393cd2b79fe8 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Fri, 10 Feb 2023 19:32:17 +0500 Subject: [PATCH 11/11] fix: backport changes to olive --- .github/workflows/push-docker-images.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/push-docker-images.yml b/.github/workflows/push-docker-images.yml index efad3827..ef465b17 100644 --- a/.github/workflows/push-docker-images.yml +++ b/.github/workflows/push-docker-images.yml @@ -4,8 +4,7 @@ on: push: branches: - master - tags: - - open-release/* + - open-release/** jobs: push: runs-on: ubuntu-latest @@ -14,16 +13,16 @@ jobs: - name: Checkout uses: actions/checkout@v2 - # Use the release name as the image tag if we're building an open release tag. - # Examples: if we're building 'open-release/maple.1', tag the image as 'maple.1'. + # Use the release name as the image tag if we're building an open release branch. + # Examples: if we're building 'open-release/maple.master', tag the image as 'maple.master'. # Otherwise, we must be building from a push to master, so use 'latest'. - name: Get tag name id: get-tag-name uses: actions/github-script@v5 with: script: | - const releasePrefix = 'refs/tags/open-release/'; - const tagName = context.ref.split(releasePrefix)[1] || 'latest'; + const branchName = context.ref.split('/').slice(-1)[0]; + const tagName = branchName === 'master' ? 'latest' : branchName; console.log('Will use tag: ' + tagName); return tagName; result-encoding: string