Merge pull request #66 from salman2013/salman/remove-bok-choy

chore: remove bok-choy usage
openedx · Oct 25, 2023 · fdd2cb4 · fdd2cb4
2 parents 5a08dcd + cdf6c0c
commit fdd2cb4
Show file tree

Hide file tree

Showing 15 changed files with 187 additions and 379 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/ci.txt b/requirements/ci.txt
@@ -8,42 +8,44 @@ asgiref==3.7.2
     # via django
 certifi==2023.7.22
     # via requests
-charset-normalizer==3.2.0
+charset-normalizer==3.3.0
     # via requests
 coverage==6.5.0
     # via coveralls
 coveralls==3.3.1
     # via -r requirements/ci.in
 distlib==0.3.7
     # via virtualenv
-django==3.2.20
+django==3.2.22
     # via
     #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
     #   edx-i18n-tools
 docopt==0.6.2
     # via coveralls
-edx-i18n-tools==1.1.0
+edx-i18n-tools==1.3.0
     # via -r requirements/ci.in
-filelock==3.12.2
+filelock==3.12.4
     # via
     #   tox
     #   virtualenv
 idna==3.4
     # via requests
-packaging==23.1
+lxml==4.9.3
+    # via edx-i18n-tools
+packaging==23.2
     # via tox
 path==16.7.1
     # via edx-i18n-tools
-platformdirs==3.10.0
+platformdirs==3.11.0
     # via virtualenv
-pluggy==1.2.0
+pluggy==1.3.0
     # via tox
 polib==1.2.0
     # via edx-i18n-tools
 py==1.11.0
     # via tox
-pytz==2023.3
+pytz==2023.3.post1
     # via django
 pyyaml==6.0.1
     # via edx-i18n-tools
@@ -60,11 +62,11 @@ tox==3.28.0
     #   -c requirements/common_constraints.txt
     #   -r requirements/ci.in
     #   tox-battery
-tox-battery==0.6.1
+tox-battery==0.6.2
     # via -r requirements/ci.in
-typing-extensions==4.7.1
+typing-extensions==4.8.0
     # via asgiref
-urllib3==2.0.4
+urllib3==2.0.7
     # via requests
-virtualenv==20.24.2
+virtualenv==20.24.5
     # via tox