diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 30ba0afaed..93ecbec605 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -3,16 +3,6 @@ # See BOM-2721 for more details. # Below is the copied and edited version of common_constraints -# This is a temporary solution to override the real common_constraints.txt -# In edx-lint, until the pyjwt constraint in edx-lint has been removed. -# See BOM-2721 for more details. -# Below is the copied and edited version of common_constraints - -# This is a temporary solution to override the real common_constraints.txt -# In edx-lint, until the pyjwt constraint in edx-lint has been removed. -# See BOM-2721 for more details. -# Below is the copied and edited version of common_constraints - # A central location for most common version constraints # (across edx repos) for pip-installation. # diff --git a/requirements/constraints.txt b/requirements/constraints.txt index f86d03e6ec..1c884c0d87 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -25,7 +25,7 @@ django-storages<1.9 # The team that owns this package will manually bump this package rather than having it pulled in automatically. # This is to allow them to better control its deployment and to do it in a process that works better # for them. -edx-enterprise==3.50.0 +edx-enterprise==3.51.0 # oauthlib>3.0.1 causes test failures ( also remove the django-oauth-toolkit constraint when this is fixed ) oauthlib==3.0.1 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index d12e3889a1..cdb67f4159 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -44,6 +44,10 @@ appdirs==1.4.4 # via fs asgiref==3.5.2 # via django +asn1crypto==1.5.1 + # via + # oscrypto + # snowflake-connector-python async-timeout==4.0.2 # via # aiohttp @@ -101,16 +105,18 @@ celery==5.2.7 # edx-celeryutils # edx-enterprise # event-tracking -certifi==2022.5.18.1 +certifi==2022.6.15 # via # -r requirements/edx/paver.txt # elasticsearch # py2neo # requests + # snowflake-connector-python cffi==1.15.0 # via # cryptography # pynacl + # snowflake-connector-python chardet==4.0.0 # via pysrt charset-normalizer==2.0.12 @@ -118,6 +124,7 @@ charset-normalizer==2.0.12 # -r requirements/edx/paver.txt # aiohttp # requests + # snowflake-connector-python chem==1.2.0 # via -r requirements/edx/base.in click==8.1.3 @@ -153,13 +160,15 @@ coreschema==0.0.4 # drf-yasg crowdsourcehinter-xblock==0.6 # via -r requirements/edx/base.in -cryptography==37.0.2 +cryptography==36.0.2 # via # -r requirements/edx/base.in # django-fernet-fields # edx-enterprise # jwcrypto # pyjwt + # pyopenssl + # snowflake-connector-python # social-auth-core cssutils==2.4.2 # via pynliner @@ -275,7 +284,7 @@ django-crum==0.7.9 # edx-rbac # edx-toggles # super-csv -django-environ==0.8.1 +django-environ==0.9.0 # via blockstore django-fernet-fields==0.6 # via @@ -352,7 +361,6 @@ django-simple-history==3.0.0 # edx-name-affirmation # edx-organizations # edx-proctoring - # learner-pathway-progress # ora2 django-splash==1.2.1 # via -r requirements/edx/base.in @@ -472,7 +480,7 @@ edx-drf-extensions==8.0.1 # edx-rbac # edx-when # edxval -edx-enterprise==3.50.0 +edx-enterprise==3.51.0 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.in @@ -495,7 +503,6 @@ edx-opaque-keys[django]==2.3.0 # edx-proctoring # edx-user-state-client # edx-when - # learner-pathway-progress # lti-consumer-xblock # openedx-events # ora2 @@ -593,6 +600,7 @@ idna==3.3 # via # -r requirements/edx/paver.txt # requests + # snowflake-connector-python # yarl importlib-metadata==4.11.4 # via markdown @@ -625,7 +633,6 @@ jsonfield==3.1.0 # edx-enterprise # edx-proctoring # edx-submissions - # learner-pathway-progress # lti-consumer-xblock # ora2 jwcrypto==1.3.1 @@ -641,7 +648,9 @@ lazy==1.4 # lti-consumer-xblock # ora2 learner-pathway-progress==1.0.1 - # via -r requirements/edx/base.in + # via + # -c requirements/edx/../constraints.txt + # -r requirements/edx/base.in libsass==0.10.0 # via # -r requirements/edx/paver.txt @@ -736,13 +745,17 @@ oauthlib==3.0.1 openedx-calc==3.0.1 # via -r requirements/edx/base.in openedx-events==0.9.1 - # via -r requirements/edx/base.in + # via + # -c requirements/edx/../constraints.txt + # -r requirements/edx/base.in openedx-filters==0.7.0 # via # -r requirements/edx/base.in # lti-consumer-xblock ora2==4.4.0 # via -r requirements/edx/base.in +oscrypto==1.3.0 + # via snowflake-connector-python packaging==21.3 # via # drf-yasg @@ -798,6 +811,7 @@ pycryptodomex==3.14.1 # edx-proctoring # lti-consumer-xblock # pyjwkest + # snowflake-connector-python pygments==2.12.0 # via # -r requirements/edx/base.in @@ -816,6 +830,7 @@ pyjwt[crypto]==2.4.0 # edx-proctoring # edx-rest-api-client # pylti1p3 + # snowflake-connector-python # social-auth-core pylatexenc==2.10 # via olxcleaner @@ -834,6 +849,8 @@ pynacl==1.5.0 # via edx-django-utils pynliner==0.8.0 # via -r requirements/edx/base.in +pyopenssl==22.0.0 + # via snowflake-connector-python pyparsing==3.0.9 # via # chem @@ -892,6 +909,7 @@ pytz==2022.1 # learner-pathway-progress # olxcleaner # ora2 + # snowflake-connector-python # xblock pyuca==1.2 # via -r requirements/edx/base.in @@ -928,6 +946,7 @@ requests==2.28.0 # requests-oauthlib # sailthru-client # slumber + # snowflake-connector-python # social-auth-core # tableauserverclient requests-oauthlib==1.3.1 @@ -998,6 +1017,8 @@ slumber==0.7.1 # edx-bulk-grades # edx-enterprise # edx-rest-api-client +snowflake-connector-python==2.7.8 + # via edx-enterprise social-auth-app-django==5.0.0 # via # -r requirements/edx/base.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index ee87c79cee..9104898b01 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -63,6 +63,11 @@ asgiref==3.5.2 # -r requirements/edx/testing.txt # django # uvicorn +asn1crypto==1.5.1 + # via + # -r requirements/edx/testing.txt + # oscrypto + # snowflake-connector-python astroid==2.11.6 # via # -r requirements/edx/testing.txt @@ -137,17 +142,19 @@ celery==5.2.7 # edx-celeryutils # edx-enterprise # event-tracking -certifi==2022.5.18.1 +certifi==2022.6.15 # via # -r requirements/edx/testing.txt # elasticsearch # py2neo # requests + # snowflake-connector-python cffi==1.15.0 # via # -r requirements/edx/testing.txt # cryptography # pynacl + # snowflake-connector-python chardet==4.0.0 # via # -r requirements/edx/testing.txt @@ -158,6 +165,7 @@ charset-normalizer==2.0.12 # -r requirements/edx/testing.txt # aiohttp # requests + # snowflake-connector-python chem==1.2.0 # via -r requirements/edx/testing.txt click==8.1.3 @@ -220,13 +228,15 @@ coverage[toml]==6.4.1 # pytest-cov crowdsourcehinter-xblock==0.6 # via -r requirements/edx/testing.txt -cryptography==37.0.2 +cryptography==36.0.2 # via # -r requirements/edx/testing.txt # django-fernet-fields # edx-enterprise # jwcrypto # pyjwt + # pyopenssl + # snowflake-connector-python # social-auth-core cssselect==1.1.0 # via @@ -367,7 +377,7 @@ django-crum==0.7.9 # super-csv django-debug-toolbar==3.4.0 # via -r requirements/edx/development.in -django-environ==0.8.1 +django-environ==0.9.0 # via # -r requirements/edx/testing.txt # blockstore @@ -452,7 +462,6 @@ django-simple-history==3.0.0 # edx-name-affirmation # edx-organizations # edx-proctoring - # learner-pathway-progress # ora2 django-splash==1.2.1 # via -r requirements/edx/testing.txt @@ -585,7 +594,7 @@ edx-drf-extensions==8.0.1 # edx-rbac # edx-when # edxval -edx-enterprise==3.50.0 +edx-enterprise==3.51.0 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt @@ -612,7 +621,6 @@ edx-opaque-keys[django]==2.3.0 # edx-proctoring # edx-user-state-client # edx-when - # learner-pathway-progress # lti-consumer-xblock # openedx-events # ora2 @@ -751,6 +759,7 @@ idna==3.3 # -r requirements/edx/testing.txt # anyio # requests + # snowflake-connector-python # yarl imagesize==1.3.0 # via sphinx @@ -760,7 +769,7 @@ importlib-metadata==4.11.4 # markdown # pytest-randomly # sphinx -importlib-resources==5.7.1 +importlib-resources==5.8.0 # via jsonschema inflection==0.5.1 # via @@ -815,7 +824,6 @@ jsonfield==3.1.0 # edx-enterprise # edx-proctoring # edx-submissions - # learner-pathway-progress # lti-consumer-xblock # ora2 jsonschema==4.6.0 @@ -842,7 +850,9 @@ lazy-object-proxy==1.7.1 # -r requirements/edx/testing.txt # astroid learner-pathway-progress==1.0.1 - # via -r requirements/edx/testing.txt + # via + # -c requirements/edx/../constraints.txt + # -r requirements/edx/testing.txt libsass==0.10.0 # via # -r requirements/edx/testing.txt @@ -963,13 +973,19 @@ oauthlib==3.0.1 openedx-calc==3.0.1 # via -r requirements/edx/testing.txt openedx-events==0.9.1 - # via -r requirements/edx/testing.txt + # via + # -c requirements/edx/../constraints.txt + # -r requirements/edx/testing.txt openedx-filters==0.7.0 # via # -r requirements/edx/testing.txt # lti-consumer-xblock ora2==4.4.0 # via -r requirements/edx/testing.txt +oscrypto==1.3.0 + # via + # -r requirements/edx/testing.txt + # snowflake-connector-python packaging==21.3 # via # -r requirements/edx/testing.txt @@ -1069,6 +1085,7 @@ pycryptodomex==3.14.1 # edx-proctoring # lti-consumer-xblock # pyjwkest + # snowflake-connector-python pydantic==1.9.1 # via # -r requirements/edx/testing.txt @@ -1093,6 +1110,7 @@ pyjwt[crypto]==2.4.0 # edx-proctoring # edx-rest-api-client # pylti1p3 + # snowflake-connector-python # social-auth-core pylatexenc==2.10 # via @@ -1138,6 +1156,10 @@ pynacl==1.5.0 # edx-django-utils pynliner==0.8.0 # via -r requirements/edx/testing.txt +pyopenssl==22.0.0 + # via + # -r requirements/edx/testing.txt + # snowflake-connector-python pyparsing==3.0.9 # via # -r requirements/edx/testing.txt @@ -1239,6 +1261,7 @@ pytz==2022.1 # learner-pathway-progress # olxcleaner # ora2 + # snowflake-connector-python # xblock pyuca==1.2 # via -r requirements/edx/testing.txt @@ -1281,6 +1304,7 @@ requests==2.28.0 # requests-oauthlib # sailthru-client # slumber + # snowflake-connector-python # social-auth-core # sphinx # tableauserverclient @@ -1383,6 +1407,10 @@ sniffio==1.2.0 # anyio snowballstemmer==2.2.0 # via sphinx +snowflake-connector-python==2.7.8 + # via + # -r requirements/edx/testing.txt + # edx-enterprise social-auth-app-django==5.0.0 # via # -r requirements/edx/testing.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index e2a875b30b..343f512d48 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -8,7 +8,7 @@ alabaster==0.7.12 # via sphinx babel==2.10.2 # via sphinx -certifi==2022.5.18.1 +certifi==2022.6.15 # via requests charset-normalizer==2.0.12 # via requests diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index f99edb8d89..87e86afebd 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -4,7 +4,7 @@ # # make upgrade # -certifi==2022.5.18.1 +certifi==2022.6.15 # via requests charset-normalizer==2.0.12 # via requests diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 7dcf8d9c8e..01e9bb2b9f 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -59,6 +59,11 @@ asgiref==3.5.2 # -r requirements/edx/base.txt # django # uvicorn +asn1crypto==1.5.1 + # via + # -r requirements/edx/base.txt + # oscrypto + # snowflake-connector-python astroid==2.11.6 # via # pylint @@ -75,6 +80,7 @@ attrs==21.4.0 # blockstore # edx-ace # openedx-events + # outcome # pytest babel==2.10.2 # via @@ -131,17 +137,19 @@ celery==5.2.7 # edx-celeryutils # edx-enterprise # event-tracking -certifi==2022.5.18.1 +certifi==2022.6.15 # via # -r requirements/edx/base.txt # elasticsearch # py2neo # requests + # snowflake-connector-python cffi==1.15.0 # via # -r requirements/edx/base.txt # cryptography # pynacl + # snowflake-connector-python chardet==4.0.0 # via # -r requirements/edx/base.txt @@ -153,6 +161,7 @@ charset-normalizer==2.0.12 # -r requirements/edx/base.txt # aiohttp # requests + # snowflake-connector-python chem==1.2.0 # via -r requirements/edx/base.txt click==8.1.3 @@ -211,13 +220,15 @@ coverage[toml]==6.4.1 # pytest-cov crowdsourcehinter-xblock==0.6 # via -r requirements/edx/base.txt -cryptography==37.0.2 +cryptography==36.0.2 # via # -r requirements/edx/base.txt # django-fernet-fields # edx-enterprise # jwcrypto # pyjwt + # pyopenssl + # snowflake-connector-python # social-auth-core cssselect==1.1.0 # via @@ -351,7 +362,7 @@ django-crum==0.7.9 # edx-rbac # edx-toggles # super-csv -django-environ==0.8.1 +django-environ==0.9.0 # via # -r requirements/edx/base.txt # blockstore @@ -436,7 +447,6 @@ django-simple-history==3.0.0 # edx-name-affirmation # edx-organizations # edx-proctoring - # learner-pathway-progress # ora2 django-splash==1.2.1 # via -r requirements/edx/base.txt @@ -567,7 +577,7 @@ edx-drf-extensions==8.0.1 # edx-rbac # edx-when # edxval -edx-enterprise==3.50.0 +edx-enterprise==3.51.0 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt @@ -595,7 +605,6 @@ edx-opaque-keys[django]==2.3.0 # edx-proctoring # edx-user-state-client # edx-when - # learner-pathway-progress # lti-consumer-xblock # openedx-events # ora2 @@ -723,6 +732,7 @@ idna==3.3 # -r requirements/edx/base.txt # anyio # requests + # snowflake-connector-python # yarl importlib-metadata==4.11.4 # via @@ -780,7 +790,6 @@ jsonfield==3.1.0 # edx-enterprise # edx-proctoring # edx-submissions - # learner-pathway-progress # lti-consumer-xblock # ora2 jwcrypto==1.3.1 @@ -803,7 +812,9 @@ lazy==1.4 lazy-object-proxy==1.7.1 # via astroid learner-pathway-progress==1.0.1 - # via -r requirements/edx/base.txt + # via + # -c requirements/edx/../constraints.txt + # -r requirements/edx/base.txt libsass==0.10.0 # via # -r requirements/edx/base.txt @@ -913,13 +924,19 @@ oauthlib==3.0.1 openedx-calc==3.0.1 # via -r requirements/edx/base.txt openedx-events==0.9.1 - # via -r requirements/edx/base.txt + # via + # -c requirements/edx/../constraints.txt + # -r requirements/edx/base.txt openedx-filters==0.7.0 # via # -r requirements/edx/base.txt # lti-consumer-xblock ora2==4.4.0 # via -r requirements/edx/base.txt +oscrypto==1.3.0 + # via + # -r requirements/edx/base.txt + # snowflake-connector-python packaging==21.3 # via # -r requirements/edx/base.txt @@ -1011,6 +1028,7 @@ pycryptodomex==3.14.1 # edx-proctoring # lti-consumer-xblock # pyjwkest + # snowflake-connector-python pydantic==1.9.1 # via fastapi pygments==2.12.0 @@ -1033,6 +1051,7 @@ pyjwt[crypto]==2.4.0 # edx-proctoring # edx-rest-api-client # pylti1p3 + # snowflake-connector-python # social-auth-core pylatexenc==2.10 # via @@ -1072,6 +1091,10 @@ pynacl==1.5.0 # edx-django-utils pynliner==0.8.0 # via -r requirements/edx/base.txt +pyopenssl==22.0.0 + # via + # -r requirements/edx/base.txt + # snowflake-connector-python pyparsing==3.0.9 # via # -r requirements/edx/base.txt @@ -1169,6 +1192,7 @@ pytz==2022.1 # learner-pathway-progress # olxcleaner # ora2 + # snowflake-connector-python # xblock pyuca==1.2 # via -r requirements/edx/base.txt @@ -1208,6 +1232,7 @@ requests==2.28.0 # requests-oauthlib # sailthru-client # slumber + # snowflake-connector-python # social-auth-core # tableauserverclient requests-oauthlib==1.3.1 @@ -1303,6 +1328,10 @@ slumber==0.7.1 # edx-rest-api-client sniffio==1.2.0 # via anyio +snowflake-connector-python==2.7.8 + # via + # -r requirements/edx/base.txt + # edx-enterprise social-auth-app-django==5.0.0 # via # -r requirements/edx/base.txt diff --git a/scripts/xblock/requirements.txt b/scripts/xblock/requirements.txt index 285b676cc3..11a89b5f64 100644 --- a/scripts/xblock/requirements.txt +++ b/scripts/xblock/requirements.txt @@ -4,7 +4,7 @@ # # make upgrade # -certifi==2022.5.18.1 +certifi==2022.6.15 # via requests charset-normalizer==2.0.12 # via requests