Merge branch 'master' into fix-xblock-runtime-deprecation

openedx · Oct 24, 2023 · 7c9f6d1 · 7c9f6d1
2 parents 1a8c1a3 + f8674c6
commit 7c9f6d1
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 448 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,22 +22,13 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
 
-    - name: Set up test environment
-      run: |
-        sudo apt-get install xvfb
-        wget https://github.com/mozilla/geckodriver/releases/download/v0.15.0/geckodriver-v0.15.0-linux64.tar.gz
-        mkdir geckodriver
-        tar -xzf geckodriver-v0.15.0-linux64.tar.gz -C geckodriver
-        export PATH=$PATH:$(pwd)/geckodriver
-        export BOTO_CONFIG=/dev/null
-
     - name: Install Requirements
       run: |
         pip install -r requirements/pip.txt
         pip install -r requirements/ci.txt
 
     - name: Run Tests
-      run: xvfb-run --server-args=-ac -- tox -e ${{ matrix.toxenv }}
+      run:  tox -e ${{ matrix.toxenv }}
 
     - name: Upload coverage to CodeCov
       if: matrix.python-version == '3.8' && matrix.toxenv == 'django42'

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -12,9 +12,9 @@ asgiref==3.7.2
     # via django
 binaryornot==0.4.4
     # via cookiecutter
-boto3==1.28.63
+boto3==1.28.68
     # via fs-s3fs
-botocore==1.31.63
+botocore==1.31.68
     # via
     #   boto3
     #   s3transfer
@@ -115,7 +115,7 @@ typing-extensions==4.8.0
     # via
     #   asgiref
     #   rich
-urllib3==1.26.17
+urllib3==1.26.18
     # via
     #   botocore
     #   requests

diff --git a/requirements/ci.in b/requirements/ci.in
@@ -3,4 +3,3 @@
 -c constraints.txt
 
 tox                       # Virtualenv management for tests
-tox-battery               # Makes tox aware of requirements file changes
diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -26,8 +26,5 @@ tox==3.28.0
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/ci.in
-    #   tox-battery
-tox-battery==0.6.2
-    # via -r requirements/ci.in
 virtualenv==20.24.5
     # via tox
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -32,16 +32,12 @@ binaryornot==0.4.4
     #   -r requirements/base.txt
     #   -r requirements/test.txt
     #   cookiecutter
-bok-choy==0.7.1
-    # via
-    #   -r requirements/test.in
-    #   -r requirements/test.txt
-boto3==1.28.63
+boto3==1.28.68
     # via
     #   -r requirements/base.txt
     #   -r requirements/test.txt
     #   fs-s3fs
-botocore==1.31.63
+botocore==1.31.68
     # via
     #   -r requirements/base.txt
     #   -r requirements/test.txt
@@ -152,7 +148,6 @@ lazy==1.6
     #   -r requirements/base.txt
     #   -r requirements/test.txt
     #   acid-xblock
-    #   bok-choy
     #   xblock
 lazy-object-proxy==1.9.0
     # via astroid
@@ -190,14 +185,6 @@ mock==5.1.0
     # via
     #   -r requirements/test.in
     #   -r requirements/test.txt
-needle==0.5.0
-    # via
-    #   -r requirements/test.txt
-    #   bok-choy
-nose==1.3.7
-    # via
-    #   -r requirements/test.txt
-    #   needle
 openedx-django-pyfs==3.4.0
     # via
     #   -r requirements/base.txt
@@ -211,10 +198,6 @@ packaging==23.2
     #   tox
 pbr==5.11.1
     # via stevedore
-pillow==10.0.1
-    # via
-    #   -r requirements/test.txt
-    #   needle
 platformdirs==3.11.0
     # via
     #   -r requirements/test.txt
@@ -315,12 +298,6 @@ s3transfer==0.7.0
     #   -r requirements/base.txt
     #   -r requirements/test.txt
     #   boto3
-selenium==3.4.1
-    # via
-    #   -r requirements/test.in
-    #   -r requirements/test.txt
-    #   bok-choy
-    #   needle
 simplejson==3.19.2
     # via
     #   -r requirements/base.txt
@@ -330,7 +307,6 @@ six==1.16.0
     # via
     #   -r requirements/base.txt
     #   -r requirements/test.txt
-    #   bok-choy
     #   edx-lint
     #   fs
     #   fs-s3fs
@@ -364,11 +340,6 @@ tox==3.28.0
     #   -c requirements/common_constraints.txt
     #   -r requirements/test.in
     #   -r requirements/test.txt
-    #   tox-battery
-tox-battery==0.6.2
-    # via
-    #   -r requirements/test.in
-    #   -r requirements/test.txt
 types-python-dateutil==2.8.19.14
     # via
     #   -r requirements/base.txt
@@ -382,7 +353,7 @@ typing-extensions==4.8.0
     #   astroid
     #   pylint
     #   rich
-urllib3==1.26.17
+urllib3==1.26.18
     # via
     #   -r requirements/base.txt
     #   -r requirements/test.txt
@@ -409,6 +380,7 @@ xblock[django]==1.8.1
     #   -r requirements/base.txt
     #   -r requirements/test.txt
     #   acid-xblock
+    #   xblock
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/requirements/pip.txt b/requirements/pip.txt
@@ -8,7 +8,7 @@ wheel==0.41.2
     # via -r requirements/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==23.2.1
+pip==23.3.1
     # via -r requirements/pip.in
 setuptools==68.2.2
     # via -r requirements/pip.in
diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -26,13 +26,11 @@ binaryornot==0.4.4
     # via
     #   -r requirements/test.txt
     #   cookiecutter
-bok-choy==0.7.1
-    # via -r requirements/test.txt
-boto3==1.28.63
+boto3==1.28.68
     # via
     #   -r requirements/test.txt
     #   fs-s3fs
-botocore==1.31.63
+botocore==1.31.68
     # via
     #   -r requirements/test.txt
     #   boto3
@@ -65,6 +63,7 @@ cookiecutter==2.4.0
 coverage[toml]==7.3.2
     # via
     #   -r requirements/test.txt
+    #   coverage
     #   pytest-cov
 ddt==1.6.0
     # via -r requirements/test.txt
@@ -126,7 +125,6 @@ lazy==1.6
     # via
     #   -r requirements/test.txt
     #   acid-xblock
-    #   bok-choy
     #   xblock
 lazy-object-proxy==1.9.0
     # via astroid
@@ -157,14 +155,6 @@ mdurl==0.1.2
     #   markdown-it-py
 mock==5.1.0
     # via -r requirements/test.txt
-needle==0.5.0
-    # via
-    #   -r requirements/test.txt
-    #   bok-choy
-nose==1.3.7
-    # via
-    #   -r requirements/test.txt
-    #   needle
 openedx-django-pyfs==3.4.0
     # via
     #   -r requirements/test.txt
@@ -177,10 +167,6 @@ packaging==23.2
     #   tox
 pbr==5.11.1
     # via stevedore
-pillow==10.0.1
-    # via
-    #   -r requirements/test.txt
-    #   needle
 platformdirs==3.11.0
     # via
     #   -r requirements/test.txt
@@ -265,19 +251,13 @@ s3transfer==0.7.0
     # via
     #   -r requirements/test.txt
     #   boto3
-selenium==3.4.1
-    # via
-    #   -r requirements/test.txt
-    #   bok-choy
-    #   needle
 simplejson==3.19.2
     # via
     #   -r requirements/test.txt
     #   xblock
 six==1.16.0
     # via
     #   -r requirements/test.txt
-    #   bok-choy
     #   edx-lint
     #   fs
     #   fs-s3fs
@@ -308,9 +288,6 @@ tox==3.28.0
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/test.txt
-    #   tox-battery
-tox-battery==0.6.2
-    # via -r requirements/test.txt
 types-python-dateutil==2.8.19.14
     # via
     #   -r requirements/test.txt
@@ -322,7 +299,7 @@ typing-extensions==4.8.0
     #   astroid
     #   pylint
     #   rich
-urllib3==1.26.17
+urllib3==1.26.18
     # via
     #   -r requirements/test.txt
     #   botocore
@@ -345,6 +322,7 @@ xblock[django]==1.8.1
     # via
     #   -r requirements/test.txt
     #   acid-xblock
+    #   xblock
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/requirements/test.in b/requirements/test.in
@@ -2,13 +2,10 @@
 -r base.txt
 
 acid-xblock
-bok_choy==0.7.1
 coverage
 ddt
 mock
 pytest-django
 pytest-cov
 pytest-rerunfailures
-selenium==3.4.1           # Forcing this version fixes issues on CI
 tox                       # Virtualenv management for tests
-tox-battery               # Makes tox aware of requirements file changes
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -22,13 +22,11 @@ binaryornot==0.4.4
     # via
     #   -r requirements/base.txt
     #   cookiecutter
-bok-choy==0.7.1
-    # via -r requirements/test.in
-boto3==1.28.63
+boto3==1.28.68
     # via
     #   -r requirements/base.txt
     #   fs-s3fs
-botocore==1.31.63
+botocore==1.31.68
     # via
     #   -r requirements/base.txt
     #   boto3
@@ -98,7 +96,6 @@ lazy==1.6
     # via
     #   -r requirements/base.txt
     #   acid-xblock
-    #   bok-choy
     #   xblock
 lxml==4.9.3
     # via
@@ -125,10 +122,6 @@ mdurl==0.1.2
     #   markdown-it-py
 mock==5.1.0
     # via -r requirements/test.in
-needle==0.5.0
-    # via bok-choy
-nose==1.3.7
-    # via needle
 openedx-django-pyfs==3.4.0
     # via
     #   -r requirements/base.txt
@@ -138,8 +131,6 @@ packaging==23.2
     #   pytest
     #   pytest-rerunfailures
     #   tox
-pillow==10.0.1
-    # via needle
 platformdirs==3.11.0
     # via virtualenv
 pluggy==1.3.0
@@ -197,19 +188,13 @@ s3transfer==0.7.0
     # via
     #   -r requirements/base.txt
     #   boto3
-selenium==3.4.1
-    # via
-    #   -r requirements/test.in
-    #   bok-choy
-    #   needle
 simplejson==3.19.2
     # via
     #   -r requirements/base.txt
     #   xblock
 six==1.16.0
     # via
     #   -r requirements/base.txt
-    #   bok-choy
     #   fs
     #   fs-s3fs
     #   python-dateutil
@@ -231,9 +216,6 @@ tox==3.28.0
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/test.in
-    #   tox-battery
-tox-battery==0.6.2
-    # via -r requirements/test.in
 types-python-dateutil==2.8.19.14
     # via
     #   -r requirements/base.txt
@@ -243,7 +225,7 @@ typing-extensions==4.8.0
     #   -r requirements/base.txt
     #   asgiref
     #   rich
-urllib3==1.26.17
+urllib3==1.26.18
     # via
     #   -r requirements/base.txt
     #   botocore
@@ -262,6 +244,7 @@ xblock[django]==1.8.1
     # via
     #   -r requirements/base.txt
     #   acid-xblock
+    #   xblock
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/tox.ini b/tox.ini
@@ -11,15 +11,14 @@ addopts = --cov workbench --cov sample_xblocks --cov-report term-missing --cov-r
 norecursedirs = .* doc bin prototype screenshots requirements
 
 [testenv]
-whitelist_externals = 
+allowlist_externals = 
     make
 deps = 
     django32: Django>=3.2,<4.0
     django42: Django>=4.2,<4.3
     -r{toxinidir}/requirements/test.txt
 passenv = 
     DISPLAY
-    BOTO_CONFIG
 commands = 
     make var/workbench.db
     python -Wd -m pytest {posargs}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,3 @@
		-c constraints.txt

		tox # Virtualenv management for tests
		tox-battery # Makes tox aware of requirements file changes