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.

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

Remove bok-choy usage #322

Merged
merged 7 commits into from
Oct 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 1 addition & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ asgiref==3.7.2
# via django
binaryornot==0.4.4
# via cookiecutter
boto3==1.28.63
boto3==1.28.65
# via fs-s3fs
botocore==1.31.63
botocore==1.31.65
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -115,7 +115,7 @@ typing-extensions==4.8.0
# via
# asgiref
# rich
urllib3==1.26.17
urllib3==1.26.18
# via
# botocore
# requests
Expand Down
31 changes: 4 additions & 27 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.65
# via
# -r requirements/base.txt
# -r requirements/test.txt
# fs-s3fs
botocore==1.31.63
botocore==1.31.65
# via
# -r requirements/base.txt
# -r requirements/test.txt
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -330,7 +307,6 @@ six==1.16.0
# via
# -r requirements/base.txt
# -r requirements/test.txt
# bok-choy
# edx-lint
# fs
# fs-s3fs
Expand Down Expand Up @@ -382,7 +358,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
Expand All @@ -409,6 +385,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
2 changes: 1 addition & 1 deletion requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
# via -r requirements/pip.in
setuptools==68.2.2
# via -r requirements/pip.in
29 changes: 5 additions & 24 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.65
# via
# -r requirements/test.txt
# fs-s3fs
botocore==1.31.63
botocore==1.31.65
# via
# -r requirements/test.txt
# boto3
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -322,7 +302,7 @@ typing-extensions==4.8.0
# astroid
# pylint
# rich
urllib3==1.26.17
urllib3==1.26.18
# via
# -r requirements/test.txt
# botocore
Expand All @@ -345,6 +325,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
2 changes: 0 additions & 2 deletions requirements/test.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
-r base.txt

acid-xblock
bok_choy==0.7.1
salman2013 marked this conversation as resolved.
Show resolved Hide resolved
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
22 changes: 4 additions & 18 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.65
# via
# -r requirements/base.txt
# fs-s3fs
botocore==1.31.63
botocore==1.31.65
# via
# -r requirements/base.txt
# boto3
Expand Down Expand Up @@ -98,7 +96,6 @@ lazy==1.6
# via
# -r requirements/base.txt
# acid-xblock
# bok-choy
# xblock
lxml==4.9.3
# via
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -243,7 +228,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
Expand All @@ -262,6 +247,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
1 change: 0 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ deps =
-r{toxinidir}/requirements/test.txt
passenv =
DISPLAY
BOTO_CONFIG
commands =
make var/workbench.db
python -Wd -m pytest {posargs}
Expand Down
39 changes: 0 additions & 39 deletions workbench/test/selenium_test.py

This file was deleted.

Loading
Loading