Fix make upgrade job (openedx#4134)

* fix: fix make upgrade job * fix: constrain selenium version
bitmakerla · Sep 28, 2023 · 0b79cf5 · 0b79cf5
1 parent 4100f54
commit 0b79cf5
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 27 deletions.
diff --git a/Makefile b/Makefile
@@ -58,16 +58,6 @@ $(COMMON_CONSTRAINTS_TXT):
 
 
 upgrade: $(COMMON_CONSTRAINTS_TXT)
-	sed 's/pyjwt\[crypto\]<2.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
-	mv requirements/common_constraints.tmp requirements/common_constraints.txt
-	sed 's/social-auth-core<4.0.3//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
-	mv requirements/common_constraints.tmp requirements/common_constraints.txt
-	sed 's/edx-auth-backends<4.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
-	mv requirements/common_constraints.tmp requirements/common_constraints.txt
-	sed 's/edx-drf-extensions<7.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
-	mv requirements/common_constraints.tmp requirements/common_constraints.txt
-	sed 's/Django<2.3//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
-	mv requirements/common_constraints.tmp requirements/common_constraints.txt
 	pip install -q -r requirements/pip_tools.txt
 	pip-compile --allow-unsafe --upgrade -o requirements/pip.txt requirements/pip.in
 	pip-compile --upgrade -o requirements/pip_tools.txt requirements/pip_tools.in
@@ -80,7 +70,7 @@ upgrade: $(COMMON_CONSTRAINTS_TXT)
 	grep -e "^django==" requirements/local.txt > requirements/django.txt
 	sed -i.tmp '/^[dD]jango==/d' requirements/local.txt
 	rm -rf requirements/local.txt.tmp
-	grep -e "^django-admin-sortable2==" requirements/local.txt > requirements/django.txt
+	grep -e "^django-admin-sortable2==" requirements/local.txt >> requirements/django.txt
 	sed -i.tmp "/^django-admin-sortable2==/d" requirements/local.txt
 	rm -rf requirements/local.txt.tmp
 	chmod a+rw requirements/*.txt

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -55,3 +55,6 @@ pillow < 10.0.0
 # 4.2.0 is breaking django-elasticsearch-debug-toolbar
 # Awaiting fix https://github.com/Benoss/django-elasticsearch-debug-toolbar/pull/21 to be merged
 django-debug-toolbar < 4.2.0
+
+# selenium==4.13.0 causing test failures 
+selenium==4.12.0
diff --git a/requirements/django.txt b/requirements/django.txt
@@ -1 +1,2 @@
+django==3.2.21
 django-admin-sortable2==1.0.4
diff --git a/requirements/local.txt b/requirements/local.txt
@@ -31,7 +31,7 @@ asn1crypto==1.5.1
     # via
     #   oscrypto
     #   snowflake-connector-python
-astroid==2.15.7
+astroid==2.15.8
     # via
     #   pylint
     #   pylint-celery
@@ -74,9 +74,9 @@ boltons==21.0.0
     #   face
     #   glom
     #   semgrep
-boto3==1.28.53
+boto3==1.28.56
     # via django-ses
-botocore==1.31.53
+botocore==1.31.56
     # via
     #   boto3
     #   s3transfer
@@ -548,7 +548,7 @@ multidict==6.0.4
     #   yarl
 mysqlclient==2.2.0
     # via -r requirements/test.in
-newrelic==9.0.0
+newrelic==9.1.0
     # via edx-django-utils
 numpy==1.24.4
     # via pandas
@@ -557,7 +557,7 @@ oauthlib==3.2.2
     #   getsmarter-api-clients
     #   requests-oauthlib
     #   social-auth-core
-openai==0.28.0
+openai==0.28.1
     # via taxonomy-connector
 openedx-atlas==0.5.0
     # via -r requirements/base.in
@@ -762,7 +762,7 @@ pyyaml==5.4.1
     #   responses
 rcssmin==1.1.1
     # via django-compressor
-redis==5.0.0
+redis==5.0.1
     # via
     #   -r requirements/base.in
     #   walrus
@@ -813,7 +813,7 @@ ruamel-yaml==0.17.32
     # via semgrep
 ruamel-yaml-clib==0.2.7
     # via ruamel-yaml
-s3transfer==0.6.2
+s3transfer==0.7.0
     # via boto3
 selenium==4.12.0
     # via -r requirements/test.in
@@ -898,7 +898,7 @@ stevedore==5.1.0
     #   code-annotations
     #   edx-django-utils
     #   edx-opaque-keys
-taxonomy-connector==1.44.2
+taxonomy-connector==1.44.3
     # via -r requirements/base.in
 testfixtures==7.2.0
     # via -r requirements/test.in
@@ -932,7 +932,7 @@ trio==0.22.2
     # via
     #   selenium
     #   trio-websocket
-trio-websocket==0.10.4
+trio-websocket==0.11.1
     # via selenium
 types-pyyaml==6.0.12.12
     # via responses

diff --git a/requirements/production.txt b/requirements/production.txt
@@ -49,9 +49,9 @@ beautifulsoup4==4.12.2
     #   taxonomy-connector
 billiard==4.1.0
     # via celery
-boto3==1.28.53
+boto3==1.28.56
     # via django-ses
-botocore==1.31.53
+botocore==1.31.56
     # via
     #   boto3
     #   s3transfer
@@ -436,7 +436,7 @@ multidict==6.0.4
     #   yarl
 mysqlclient==2.2.0
     # via -r requirements/production.in
-newrelic==9.0.0
+newrelic==9.1.0
     # via
     #   -r requirements/production.in
     #   edx-django-utils
@@ -447,7 +447,7 @@ oauthlib==3.2.2
     #   getsmarter-api-clients
     #   requests-oauthlib
     #   social-auth-core
-openai==0.28.0
+openai==0.28.1
     # via taxonomy-connector
 openedx-atlas==0.5.0
     # via -r requirements/base.in
@@ -567,7 +567,7 @@ pyyaml==6.0.1
     #   edx-django-release-util
 rcssmin==1.1.1
     # via django-compressor
-redis==5.0.0
+redis==5.0.1
     # via
     #   -r requirements/base.in
     #   walrus
@@ -605,7 +605,7 @@ rjsmin==1.2.1
     # via django-compressor
 rsa==4.9
     # via google-auth
-s3transfer==0.6.2
+s3transfer==0.7.0
     # via boto3
 semantic-version==2.10.0
     # via edx-drf-extensions
@@ -651,7 +651,7 @@ stevedore==5.1.0
     #   code-annotations
     #   edx-django-utils
     #   edx-opaque-keys
-taxonomy-connector==1.44.2
+taxonomy-connector==1.44.3
     # via -r requirements/base.in
 text-unidecode==1.3
     # via python-slugify