feat: TNL-10136 fix dependencies

Multiple commits squashed. Common theme was to resolve dependencies with master branch
openedx · Dec 13, 2022 · 6e75002 · 6e75002
1 parent 89086d4
commit 6e75002
Show file tree

Hide file tree

Showing 8 changed files with 64,823 additions and 9 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -34,8 +34,6 @@
     "file-loader": "1.1.6",
     "font-awesome": "4.7.0",
     "hls.js": "0.14.17",
-    "importlib": "1.0.4",
-    "importlib-resources": "5.10.0",
     "imports-loader": "0.7.1",
     "jest-environment-jsdom": "^26.0.0",
     "jquery": "2.2.4",
@@ -85,8 +83,6 @@
     "eslint-config-edx": "3.0.1",
     "eslint-config-edx-es5": "2.0.0",
     "eslint-import-resolver-webpack": "0.8.4",
-    "importlib": "1.0.4",
-    "importlib-resources": "5.10.0",
     "jasmine-core": "2.6.4",
     "jasmine-jquery": "git+https://[email protected]/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58",
     "jest": "26.0.0",

diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
@@ -3,11 +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
-
 # A central location for most common version constraints
 # (across edx repos) for pip-installation.
 #

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
@@ -50,6 +50,8 @@ babel==2.11.0
     #   enmerkar-underscore
 backoff==1.10.0
     # via analytics-python
+backports-zoneinfo==0.2.1
+    # via icalendar
 beautifulsoup4==4.11.1
     # via pynliner
 billiard==3.6.4.0
@@ -605,6 +607,10 @@ idna==3.4
     #   requests
     #   snowflake-connector-python
     #   yarl
+importlib-metadata==5.1.0
+    # via markdown
+importlib-resources==5.10.1
+    # via jsonschema
 inflection==0.5.1
     # via drf-yasg
 interchange==2021.0.4
@@ -800,6 +806,8 @@ pillow==9.3.0
     #   -r requirements/edx/base.in
     #   edx-enterprise
     #   edx-organizations
+pkgutil-resolve-name==1.3.10
+    # via jsonschema
 polib==1.1.1
     # via edx-i18n-tools
 prompt-toolkit==3.0.31
@@ -1185,6 +1193,10 @@ xss-utils==0.4.0
     # via -r requirements/edx/base.in
 yarl==1.8.1
     # via aiohttp
+zipp==3.11.0
+    # via
+    #   importlib-metadata
+    #   importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
@@ -79,6 +79,10 @@ backoff==1.10.0
     # via
     #   -r requirements/edx/testing.txt
     #   analytics-python
+backports-zoneinfo==0.2.1
+    # via
+    #   -r requirements/edx/testing.txt
+    #   icalendar
 beautifulsoup4==4.11.1
     # via
     #   -r requirements/edx/testing.txt
@@ -1071,6 +1075,10 @@ pillow==9.3.0
     #   edx-organizations
 pip-tools==6.9.0
     # via -r requirements/edx/pip-tools.txt
+pkgutil-resolve-name==1.3.10
+    # via
+    #   -r requirements/edx/testing.txt
+    #   jsonschema
 platformdirs==2.5.2
     # via
     #   -r requirements/edx/testing.txt
@@ -1572,11 +1580,14 @@ tqdm==4.64.1
 typing-extensions==4.4.0
     # via
     #   -r requirements/edx/testing.txt
+    #   astroid
     #   django-countries
     #   import-linter
     #   mypy
     #   pydantic
+    #   pylint
     #   snowflake-connector-python
+    #   starlette
 unicodecsv==0.14.1
     # via
     #   -r requirements/edx/testing.txt
@@ -1694,6 +1705,11 @@ yarl==1.8.1
     # via
     #   -r requirements/edx/testing.txt
     #   aiohttp
+zipp==3.11.0
+    # via
+    #   -r requirements/edx/testing.txt
+    #   importlib-metadata
+    #   importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
@@ -34,6 +34,8 @@ idna==3.4
     # via requests
 imagesize==1.4.1
     # via sphinx
+importlib-metadata==5.1.0
+    # via sphinx
 jinja2==3.1.2
     # via
     #   code-annotations
@@ -86,3 +88,5 @@ text-unidecode==1.3
     # via python-slugify
 urllib3==1.26.12
     # via requests
+zipp==3.11.0
+    # via importlib-metadata
diff --git a/requirements/edx/pip.txt b/requirements/edx/pip.txt
@@ -4,6 +4,10 @@
 #
 #    make upgrade
 #
+--index-url http://edx.devstack.devpi:3141/root/pypi/+simple/
+--extra-index-url https://pypi.python.org/simple
+--trusted-host edx.devstack.devpi
+
 wheel==0.38.4
     # via -r requirements/edx/pip.in
 

diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
@@ -73,6 +73,10 @@ backoff==1.10.0
     # via
     #   -r requirements/edx/base.txt
     #   analytics-python
+backports-zoneinfo==0.2.1
+    # via
+    #   -r requirements/edx/base.txt
+    #   icalendar
 beautifulsoup4==4.11.1
     # via
     #   -r requirements/edx/base.txt
@@ -1008,6 +1012,10 @@ pillow==9.3.0
     #   -r requirements/edx/base.txt
     #   edx-enterprise
     #   edx-organizations
+pkgutil-resolve-name==1.3.10
+    # via
+    #   -r requirements/edx/base.txt
+    #   jsonschema
 platformdirs==2.5.2
     # via
     #   pylint
@@ -1456,10 +1464,13 @@ tqdm==4.64.1
 typing-extensions==4.4.0
     # via
     #   -r requirements/edx/base.txt
+    #   astroid
     #   django-countries
     #   import-linter
     #   pydantic
+    #   pylint
     #   snowflake-connector-python
+    #   starlette
 unicodecsv==0.14.1
     # via
     #   -r requirements/edx/base.txt
@@ -1567,6 +1578,11 @@ yarl==1.8.1
     # via
     #   -r requirements/edx/base.txt
     #   aiohttp
+zipp==3.11.0
+    # via
+    #   -r requirements/edx/base.txt
+    #   importlib-metadata
+    #   importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools