Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: remove bok-choy usage #66

Merged
merged 1 commit into from
Oct 25, 2023
Merged

chore: remove bok-choy usage #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will stop running all environments of tox test cases. Try following

      - name: Run Tests
        run: tox -e ${{ matrix.toxenv }}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@farhan it did not affect, I found there is some issue due to which ci.yml is not executing even in some past PRs, I am creating a separate issue so that we can properly find the reason to fix it.
https://github.com/orgs/openedx/projects/55/views/1?pane=issue&itemId=42628017

run: xvfb-run --server-args=-ac -- tox -e ${{ matrix.toxenv }}
env:
BOKCHOY_HEADLESS: true
TOXENV: ${{ matrix.toxenv }}
run: tox
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 0 additions & 20 deletions google_drive/tests/integration/base_test.py
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions google_drive/tests/integration/studio_scenarios.py
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions google_drive/tests/integration/test_publish.py
View file
Open in desktop

This file was deleted.

131 changes: 0 additions & 131 deletions google_drive/tests/integration/test_studio.py
View file
Open in desktop

This file was deleted.

26 changes: 14 additions & 12 deletions requirements/ci.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Loading