Merge branch 'master' into zshkoor/tox-updates

openedx · Oct 30, 2023 · 9484d9b · 9484d9b
2 parents ac9aa13 + fdd2cb4
commit 9484d9b
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 267 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,23 +16,11 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Set up test environment
-        run: |
-          sudo apt-get update
-          sudo apt-get install xvfb gettext
-          wget https://github.com/mozilla/geckodriver/releases/download/v0.25.0/geckodriver-v0.25.0-linux64.tar.gz
-          mkdir geckodriver
-          tar -xzf geckodriver-v0.25.0-linux64.tar.gz -C geckodriver
-          export PATH=$PATH:$PWD/geckodriver
-          export BOKCHOY_HEADLESS=true
-
-      - run: geckodriver --version
-
       - name: Install Requirements
         run: |
           pip install -r requirements/ci.txt
 
       - name: Run Tests
-        run: xvfb-run --server-args=-ac -- tox -e ${{ matrix.toxenv }}
         env:
-          BOKCHOY_HEADLESS: true
+          TOXENV: ${{ matrix.toxenv }}
+        run: tox
diff --git a/Makefile b/Makefile
@@ -55,6 +55,7 @@ upgrade: $(COMMON_CONSTRAINTS_TXT)
 	pip-compile --upgrade -o requirements/dev.txt requirements/base.in requirements/dev.in requirements/quality.in requirements/test.in requirements/travis.in
 	pip-compile --upgrade -o requirements/quality.txt requirements/base.in requirements/quality.in requirements/test.in
 	pip-compile --upgrade -o requirements/test.txt requirements/base.in requirements/test.in
+	pip-compile --upgrade -o requirements/travis.txt requirements/travis.in
 	pip-compile --upgrade -o requirements/ci.txt requirements/ci.in
 	# Let tox control the Django version for tests
 	grep -e "^django==" requirements/test.txt > requirements/django.txt

diff --git a/google_drive/tests/integration/base_test.py b/google_drive/tests/integration/base_test.py
diff --git a/google_drive/tests/integration/studio_scenarios.py b/google_drive/tests/integration/studio_scenarios.py
diff --git a/google_drive/tests/integration/test_publish.py b/google_drive/tests/integration/test_publish.py
diff --git a/google_drive/tests/integration/test_studio.py b/google_drive/tests/integration/test_studio.py
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -18,8 +18,6 @@ backports-functools-lru-cache==1.6.6
     # via caniusepython3
 binaryornot==0.4.4
     # via cookiecutter
-bok-choy==2.0.2
-    # via -r requirements/test.in
 boto3==1.28.70
     # via fs-s3fs
 botocore==1.31.70
@@ -60,7 +58,7 @@ coveralls==3.3.1
     # via -r requirements/travis.in
 ddt==1.6.0
     # via -r requirements/test.in
-diff-cover==7.7.0
+diff-cover==8.0.0
     # via -r requirements/dev.in
 distlib==0.3.7
     # via
@@ -119,9 +117,7 @@ jmespath==1.0.1
     #   boto3
     #   botocore
 lazy==1.6
-    # via
-    #   bok-choy
-    #   xblock
+    # via xblock
 lazy-object-proxy==1.9.0
     # via astroid
 lxml==4.9.3
@@ -246,8 +242,6 @@ rich==13.6.0
     # via cookiecutter
 s3transfer==0.7.0
     # via boto3
-selenium==3.141.0
-    # via bok-choy
 simplejson==3.19.2
     # via
     #   xblock
@@ -299,7 +293,6 @@ urllib3==1.26.18
     # via
     #   botocore
     #   requests
-    #   selenium
     #   transifex-client
 virtualenv==20.24.6
     # via tox

diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -18,11 +18,9 @@ backports-functools-lru-cache==1.6.6
     # via caniusepython3
 binaryornot==0.4.4
     # via cookiecutter
-bok-choy==2.0.2
-    # via -r requirements/test.in
-boto3==1.28.70
+boto3==1.28.67
     # via fs-s3fs
-botocore==1.31.70
+botocore==1.31.67
     # via
     #   boto3
     #   s3transfer
@@ -57,7 +55,7 @@ coverage[toml]==7.3.2
     #   pytest-cov
 ddt==1.6.0
     # via -r requirements/test.in
-diff-cover==7.7.0
+diff-cover==8.0.0
     # via -r requirements/dev.in
 distlib==0.3.7
     # via caniusepython3
@@ -105,9 +103,7 @@ jmespath==1.0.1
     #   boto3
     #   botocore
 lazy==1.6
-    # via
-    #   bok-choy
-    #   xblock
+    # via xblock
 lazy-object-proxy==1.9.0
     # via astroid
 lxml==4.9.3
@@ -219,8 +215,6 @@ rich==13.6.0
     # via cookiecutter
 s3transfer==0.7.0
     # via boto3
-selenium==3.141.0
-    # via bok-choy
 simplejson==3.19.2
     # via
     #   xblock
@@ -266,7 +260,6 @@ urllib3==1.26.18
     # via
     #   botocore
     #   requests
-    #   selenium
     #   transifex-client
 web-fragments==2.1.0
     # via

diff --git a/requirements/test.in b/requirements/test.in
@@ -3,7 +3,6 @@
 
 -r dev.in
 
-bok-choy
 ddt
 mock
 nose
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ @@
     -r dev.in
-    bok-choy
     ddt
     mock
     nose
@@ Expand Down @@