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

chore: remove bok-choy usage #2122

Merged
merged 1 commit into from
Dec 19, 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
7 changes: 0 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,6 @@ coverage.xml
test_ora2db
test_ora2db-journal

# Bok choy
test/custom_a11y_rules.js
test/acceptance/screenshots/*.png
test/logs/*
test/acceptance/xunit-*

# Mr Developer
.mr.developer.cfg
.project
Expand Down Expand Up @@ -76,7 +70,6 @@ coverage
ora2db
storage/*
openassessment/xblock/static/js/fixtures/*.html
test/selenium/screenshots/*

# logging
logs/*.log*
Expand Down
6 changes: 0 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,6 @@ test-js-debug: render-templates ## Debug JavaScript tests using Karma

test: quality test-python test-js ## Run quality checks and tests for Python and JavaScript

test-acceptance: ## acceptance and a11y tests require a functioning sandbox, and do not run on travis
./scripts/test-acceptance.sh tests

test-a11y: ## Run accessibility tests
./scripts/test-acceptance.sh accessibility

test-sandbox: test-acceptance test-a11y ## Run acceptance and accessibility tests

install-osx-requirements: ## Install OSX specific requirements using Homebrew
Expand Down
52 changes: 30 additions & 22 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.9
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
Expand All @@ -8,19 +8,19 @@ appdirs==1.4.4
# via fs
asgiref==3.7.2
# via django
bleach==6.0.0
bleach==6.1.0
# via -r requirements/base.in
boto3==1.28.31
boto3==1.29.5
# via -r requirements/base.in
botocore==1.31.31
botocore==1.32.5
# via
# boto3
# s3transfer
certifi==2023.7.22
certifi==2023.11.17
# via requests
cffi==1.15.1
cffi==1.16.0
# via pynacl
charset-normalizer==3.2.0
charset-normalizer==3.3.2
# via requests
click==8.1.7
# via
Expand All @@ -30,7 +30,7 @@ code-annotations==1.5.0
# via edx-toggles
defusedxml==0.7.1
# via -r requirements/base.in
django==3.2.20
django==3.2.23
# via
# -c requirements/constraints.txt
# -r requirements/base.in
Expand Down Expand Up @@ -63,13 +63,13 @@ djangorestframework==3.14.0
# via
# -r requirements/base.in
# edx-submissions
edx-django-utils==5.7.0
edx-django-utils==5.8.0
# via
# -r requirements/base.in
# edx-toggles
edx-i18n-tools==1.1.0
edx-i18n-tools==1.3.0
# via -r requirements/base.in
edx-opaque-keys==2.4.0
edx-opaque-keys==2.5.1
# via -r requirements/base.in
edx-submissions==3.6.0
# via -r requirements/base.in
Expand All @@ -95,7 +95,7 @@ jsonfield==3.1.0
# via
# -r requirements/base.in
# edx-submissions
lazy==1.5
lazy==1.6
# via -r requirements/base.in
loremipsum==1.0.5
# via
Expand All @@ -104,12 +104,16 @@ loremipsum==1.0.5
lxml==4.9.3
# via
# -r requirements/base.in
# edx-i18n-tools
# xblock
mako==1.3.0
# via xblock
markupsafe==2.1.3
# via
# jinja2
# mako
# xblock
newrelic==8.10.1
newrelic==9.2.0
# via edx-django-utils
path==13.1.0
# via
Expand All @@ -118,11 +122,11 @@ path==13.1.0
# path-py
path-py==12.5.0
# via -r requirements/base.in
pbr==5.11.1
pbr==6.0.0
# via stevedore
polib==1.2.0
# via edx-i18n-tools
psutil==5.9.5
psutil==5.9.6
# via edx-django-utils
pycparser==2.21
# via cffi
Expand All @@ -141,7 +145,7 @@ python-swiftclient==3.13.1
# via
# -c requirements/constraints.txt
# -r requirements/base.in
pytz==2023.3
pytz==2023.3.post1
# via
# -r requirements/base.in
# django
Expand All @@ -156,8 +160,10 @@ pyyaml==6.0.1
# xblock
requests==2.31.0
# via python-swiftclient
s3transfer==0.6.2
s3transfer==0.7.0
# via boto3
simplejson==3.19.2
# via xblock
six==1.16.0
# via
# bleach
Expand All @@ -174,13 +180,15 @@ stevedore==5.1.0
# edx-opaque-keys
text-unidecode==1.3
# via python-slugify
typing-extensions==4.7.1
# via asgiref
urllib3==1.26.16
typing-extensions==4.8.0
# via
# asgiref
# edx-opaque-keys
urllib3==1.26.18
# via
# botocore
# requests
voluptuous==0.13.1
voluptuous==0.14.1
# via
# -c requirements/constraints.txt
# -r requirements/base.in
Expand All @@ -192,7 +200,7 @@ webencodings==0.5.1
# html5lib
webob==1.8.7
# via xblock
xblock==1.7.0
xblock==1.8.1
# via -r requirements/base.in

# The following packages are considered to be unsafe in a requirements file:
Expand Down
24 changes: 12 additions & 12 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
#
# This file is autogenerated by pip-compile with Python 3.9
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
cachetools==5.3.1
cachetools==5.3.2
# via
# -r requirements/tox.txt
# tox
certifi==2023.7.22
certifi==2023.11.17
# via requests
chardet==5.2.0
# via
# -r requirements/tox.txt
# tox
charset-normalizer==3.2.0
charset-normalizer==3.3.2
# via requests
colorama==0.4.6
# via
Expand All @@ -30,7 +30,7 @@ distlib==0.3.7
# virtualenv
docopt==0.6.2
# via coveralls
filelock==3.12.2
filelock==3.13.1
# via
# -r requirements/tox.txt
# tox
Expand All @@ -39,21 +39,21 @@ idna==2.8
# via
# -c requirements/constraints.txt
# requests
packaging==23.1
packaging==23.2
# via
# -r requirements/tox.txt
# pyproject-api
# tox
platformdirs==3.10.0
platformdirs==4.0.0
# via
# -r requirements/tox.txt
# tox
# virtualenv
pluggy==1.2.0
pluggy==1.3.0
# via
# -r requirements/tox.txt
# tox
pyproject-api==1.5.4
pyproject-api==1.6.1
# via
# -r requirements/tox.txt
# tox
Expand All @@ -64,11 +64,11 @@ tomli==2.0.1
# -r requirements/tox.txt
# pyproject-api
# tox
tox==4.10.0
tox==4.11.3
# via -r requirements/tox.txt
urllib3==2.0.4
urllib3==2.1.0
# via requests
virtualenv==20.24.3
virtualenv==20.24.7
# via
# -r requirements/tox.txt
# tox
8 changes: 4 additions & 4 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@


# A central location for most common version constraints
# (across edx repos) for pip-installation.
#
Expand All @@ -24,6 +23,7 @@ elasticsearch<7.14.0
# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected


# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
tox<4.0.0
# virtualenv latest version requires platformdirs<4.0 which conflicts with tox>4.0 version
# This constraint can be removed once the issue
# https://github.com/pypa/virtualenv/issues/2666 gets resolved
platformdirs<4.0
20 changes: 11 additions & 9 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.9
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
Expand All @@ -8,15 +8,15 @@ accessible-pygments==0.0.4
# via pydata-sphinx-theme
alabaster==0.7.13
# via sphinx
babel==2.12.1
babel==2.13.1
# via
# pydata-sphinx-theme
# sphinx
beautifulsoup4==4.12.2
# via pydata-sphinx-theme
certifi==2023.7.22
certifi==2023.11.17
# via requests
charset-normalizer==3.2.0
charset-normalizer==3.3.2
# via requests
colorama==0.4.6
# via sphinx-autobuild
Expand All @@ -36,24 +36,26 @@ livereload==2.6.3
# via sphinx-autobuild
markupsafe==2.1.3
# via jinja2
packaging==23.1
packaging==23.2
# via
# pydata-sphinx-theme
# sphinx
pydata-sphinx-theme==0.13.3
# via sphinx-book-theme
pygments==2.16.1
pygments==2.17.2
# via
# accessible-pygments
# pydata-sphinx-theme
# sphinx
pytz==2023.3.post1
# via babel
requests==2.31.0
# via sphinx
six==1.16.0
# via livereload
snowballstemmer==2.2.0
# via sphinx
soupsieve==2.4.1
soupsieve==2.5
# via beautifulsoup4
sphinx==4.3.2
# via
Expand Down Expand Up @@ -87,9 +89,9 @@ sphinxcontrib-serializinghtml==1.1.5
# via sphinx
tornado==6.3.3
# via livereload
typing-extensions==4.7.1
typing-extensions==4.8.0
# via pydata-sphinx-theme
urllib3==2.0.4
urllib3==2.1.0
# via requests

# The following packages are considered to be unsafe in a requirements file:
Expand Down
12 changes: 8 additions & 4 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
#
# This file is autogenerated by pip-compile with Python 3.9
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
build==0.10.0
build==1.0.3
# via pip-tools
click==8.1.7
# via pip-tools
packaging==23.1
importlib-metadata==6.8.0
# via build
packaging==23.2
# via build
pip-tools==7.3.0
# via -r requirements/pip-tools.in
Expand All @@ -19,8 +21,10 @@ tomli==2.0.1
# build
# pip-tools
# pyproject-hooks
wheel==0.41.1
wheel==0.41.3
# via pip-tools
zipp==3.17.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
6 changes: 3 additions & 3 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#
# This file is autogenerated by pip-compile with Python 3.9
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
wheel==0.41.1
wheel==0.41.3
# 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==59.8.0
# via
Expand Down
Loading
Loading