Skip to content

Commit

Permalink
Merge pull request #447 from salman2013/salman/remove-bok-choy-usage
Browse files Browse the repository at this point in the history
chore: remove bok-choy usage
  • Loading branch information
Feanil Patel authored Nov 28, 2023
2 parents 0ae5252 + 51bbdc0 commit 3f1bc2a
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 19 deletions.
5 changes: 5 additions & 0 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#
# make upgrade
#
aiohttp==3.9.0
aiohttp==3.9.0
# via
# -r requirements/quality.txt
Expand Down Expand Up @@ -40,6 +41,7 @@ cachetools==5.3.2
# -r requirements/quality.txt
# google-auth
# tox
certifi==2023.11.17
certifi==2023.11.17
# via
# -r requirements/quality.txt
Expand Down Expand Up @@ -96,6 +98,7 @@ dockerfile==3.3.1
# via -r requirements/quality.txt
edx-lint==5.3.6
# via -r requirements/quality.txt
exceptiongroup==1.2.0
exceptiongroup==1.2.0
# via
# -r requirements/quality.txt
Expand Down Expand Up @@ -207,6 +210,7 @@ pluggy==1.3.0
# diff-cover
# pytest
# tox
pyasn1==0.5.1
pyasn1==0.5.1
# via
# -r requirements/quality.txt
Expand Down Expand Up @@ -375,6 +379,7 @@ wheel==0.41.3
# via
# -r requirements/pip-tools.txt
# pip-tools
yarl==1.9.3
yarl==1.9.3
# via
# -r requirements/quality.txt
Expand Down
5 changes: 5 additions & 0 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#
accessible-pygments==0.0.4
# via pydata-sphinx-theme
aiohttp==3.9.0
aiohttp==3.9.0
# via
# -r requirements/test.txt
Expand Down Expand Up @@ -35,6 +36,7 @@ cachetools==5.3.2
# via
# -r requirements/test.txt
# google-auth
certifi==2023.11.17
certifi==2023.11.17
# via
# -r requirements/test.txt
Expand All @@ -59,6 +61,7 @@ docutils==0.19
# readme-renderer
# restructuredtext-lint
# sphinx
exceptiongroup==1.2.0
exceptiongroup==1.2.0
# via
# -r requirements/test.txt
Expand Down Expand Up @@ -132,6 +135,7 @@ pluggy==1.3.0
# via
# -r requirements/test.txt
# pytest
pyasn1==0.5.1
pyasn1==0.5.1
# via
# -r requirements/test.txt
Expand Down Expand Up @@ -242,6 +246,7 @@ urllib3==2.1.0
# -r requirements/test.txt
# requests
# responses
yarl==1.9.3
yarl==1.9.3
# via
# -r requirements/test.txt
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
-c constraints.txt

black
bok-choy
ddt
edx-lint
factory-boy
Expand Down
8 changes: 3 additions & 5 deletions tests/fake_repos/python_js_repo/requirements/development.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ backports.entry-points-selectable==1.0.3 # via -r requirements/edx/testing.txt,
beautifulsoup4==4.9.3 # via -r requirements/edx/testing.txt, pynliner
billiard==3.6.4.0 # via -r requirements/edx/testing.txt, celery
bleach==3.3.0 # via -r requirements/edx/testing.txt, django-wiki, edx-enterprise, lti-consumer-xblock, ora2, xblock-drag-and-drop-v2, xblock-poll
bok-choy==1.1.1 # via -r requirements/edx/testing.txt
boto3==1.4.8 # via -r requirements/edx/testing.txt, django-ses, fs-s3fs, ora2
boto==2.39.0 # via -r requirements/edx/testing.txt, edxval
botocore==1.8.17 # via -r requirements/edx/testing.txt, boto3, s3transfer
Expand Down Expand Up @@ -174,7 +173,7 @@ jsonschema==3.2.0 # via sphinxcontrib-openapi
kombu==4.6.11 # via -r requirements/edx/testing.txt, celery
laboratory==1.0.2 # via -r requirements/edx/testing.txt
lazy-object-proxy==1.6.0 # via -r requirements/edx/testing.txt, astroid
lazy==1.4 # via -r requirements/edx/testing.txt, acid-xblock, bok-choy, lti-consumer-xblock, ora2
lazy==1.4 # via -r requirements/edx/testing.txt, acid-xblock, lti-consumer-xblock, ora2
libsass==0.10.0 # via -r requirements/edx/testing.txt, ora2
loremipsum==1.0.5 # via -r requirements/edx/testing.txt, ora2
lti-consumer-xblock==2.7.1 # via -r requirements/edx/testing.txt
Expand Down Expand Up @@ -265,12 +264,11 @@ rules==2.2 # via -r requirements/edx/testing.txt, edx-enterprise,
s3transfer==0.1.13 # via -r requirements/edx/testing.txt, boto3
sailthru-client==2.2.3 # via -r requirements/edx/testing.txt, edx-ace
scipy==1.6.2 # via -r requirements/edx/testing.txt, chem, openedx-calc
selenium==3.141.0 # via -r requirements/edx/testing.txt, bok-choy
semantic-version==2.8.5 # via -r requirements/edx/testing.txt, edx-drf-extensions
shapely==1.7.1 # via -r requirements/edx/testing.txt
simplejson==3.17.2 # via -r requirements/edx/testing.txt, sailthru-client, super-csv, xblock-utils
singledispatch==3.6.1 # via -r requirements/edx/testing.txt
six==1.15.0 # via -r requirements/edx/pip-tools.txt, -r requirements/edx/testing.txt, analytics-python, bleach, bok-choy, chem, codejail, crowdsourcehinter-xblock, cryptography, django-countries, django-simple-history, edx-ace, edx-bulk-grades, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-lint, edx-milestones, edx-rbac, edx-sphinx-theme, event-tracking, freezegun, fs, fs-s3fs, html5lib, httpretty, isodate, jsonschema, libsass, paver, pip-tools, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, singledispatch, social-auth-app-django, social-auth-core, sphinxcontrib-httpdomain, stevedore, tox, transifex-client, virtualenv, xblock
six==1.15.0 # via -r requirements/edx/pip-tools.txt, -r requirements/edx/testing.txt, analytics-python, bleach, chem, codejail, crowdsourcehinter-xblock, cryptography, django-countries, django-simple-history, edx-ace, edx-bulk-grades, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-lint, edx-milestones, edx-rbac, edx-sphinx-theme, event-tracking, freezegun, fs, fs-s3fs, html5lib, httpretty, isodate, jsonschema, libsass, paver, pip-tools, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, singledispatch, social-auth-app-django, social-auth-core, sphinxcontrib-httpdomain, stevedore, tox, transifex-client, virtualenv, xblock
slumber==0.7.1 # via -r requirements/edx/testing.txt, edx-bulk-grades, edx-enterprise, edx-rest-api-client
smmap==4.0.0 # via -r requirements/edx/testing.txt, gitdb
snowballstemmer==2.1.0 # via sphinx
Expand Down Expand Up @@ -306,7 +304,7 @@ ua-parser==0.10.0 # via -r requirements/edx/testing.txt, django-cookies-
unicodecsv==0.14.1 # via -r requirements/edx/testing.txt, edx-enterprise
unidiff==0.6.0 # via -r requirements/edx/testing.txt, coverage-pytest-plugin
uritemplate==3.0.1 # via -r requirements/edx/testing.txt, coreapi, drf-yasg
urllib3==1.26.4 # via -r requirements/edx/testing.txt, elasticsearch, geoip2, requests, selenium, transifex-client
urllib3==1.26.4 # via -r requirements/edx/testing.txt, elasticsearch, geoip2, requests, transifex-client
user-util==1.0.0 # via -r requirements/edx/testing.txt
vine==1.3.0 # via -r requirements/edx/testing.txt, amqp, celery
virtualenv==20.4.3 # via -r requirements/edx/testing.txt, tox
Expand Down
8 changes: 3 additions & 5 deletions tests/fake_repos/python_js_repo/requirements/testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ backports.entry-points-selectable==1.0.3 # via pytest-randomly
beautifulsoup4==4.9.3 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, pynliner
billiard==3.6.4.0 # via -r requirements/edx/base.txt, celery
bleach==3.3.0 # via -r requirements/edx/base.txt, django-wiki, edx-enterprise, lti-consumer-xblock, ora2, xblock-drag-and-drop-v2, xblock-poll
bok-choy==1.1.1 # via -r requirements/edx/testing.in
boto3==1.4.8 # via -r requirements/edx/base.txt, django-ses, fs-s3fs, ora2
boto==2.39.0 # via -r requirements/edx/base.txt, edxval
botocore==1.8.17 # via -r requirements/edx/base.txt, boto3, s3transfer
Expand Down Expand Up @@ -168,7 +167,7 @@ jsonfield2==3.0.3 # via -c requirements/edx/../constraints.txt, -r requi
kombu==4.6.11 # via -r requirements/edx/base.txt, celery
laboratory==1.0.2 # via -r requirements/edx/base.txt
lazy-object-proxy==1.6.0 # via astroid
lazy==1.4 # via -r requirements/edx/base.txt, acid-xblock, bok-choy, lti-consumer-xblock, ora2
lazy==1.4 # via -r requirements/edx/base.txt, acid-xblock, lti-consumer-xblock, ora2
libsass==0.10.0 # via -r requirements/edx/base.txt, ora2
loremipsum==1.0.5 # via -r requirements/edx/base.txt, ora2
lti-consumer-xblock==2.7.1 # via -r requirements/edx/base.txt
Expand Down Expand Up @@ -254,12 +253,11 @@ rules==2.2 # via -r requirements/edx/base.txt, edx-enterprise, ed
s3transfer==0.1.13 # via -r requirements/edx/base.txt, boto3
sailthru-client==2.2.3 # via -r requirements/edx/base.txt, edx-ace
scipy==1.6.2 # via -r requirements/edx/base.txt, chem, openedx-calc
selenium==3.141.0 # via -r requirements/edx/testing.in, bok-choy
semantic-version==2.8.5 # via -r requirements/edx/base.txt, edx-drf-extensions
shapely==1.7.1 # via -r requirements/edx/base.txt
simplejson==3.17.2 # via -r requirements/edx/base.txt, sailthru-client, super-csv, xblock-utils
singledispatch==3.6.1 # via -r requirements/edx/testing.in
six==1.15.0 # via -r requirements/edx/base.txt, analytics-python, bleach, bok-choy, chem, codejail, crowdsourcehinter-xblock, cryptography, django-countries, django-simple-history, edx-ace, edx-bulk-grades, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-lint, edx-milestones, edx-rbac, event-tracking, freezegun, fs, fs-s3fs, html5lib, httpretty, isodate, libsass, paver, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, singledispatch, social-auth-app-django, social-auth-core, stevedore, tox, transifex-client, virtualenv, xblock
six==1.15.0 # via -r requirements/edx/base.txt, analytics-python, bleach, chem, codejail, crowdsourcehinter-xblock, cryptography, django-countries, django-simple-history, edx-ace, edx-bulk-grades, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-lint, edx-milestones, edx-rbac, event-tracking, freezegun, fs, fs-s3fs, html5lib, httpretty, isodate, libsass, paver, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, singledispatch, social-auth-app-django, social-auth-core, stevedore, tox, transifex-client, virtualenv, xblock
slumber==0.7.1 # via -r requirements/edx/base.txt, edx-bulk-grades, edx-enterprise, edx-rest-api-client
smmap==4.0.0 # via gitdb
social-auth-app-django==4.0.0 # via -r requirements/edx/base.txt
Expand All @@ -285,7 +283,7 @@ ua-parser==0.10.0 # via -r requirements/edx/base.txt, django-cookies-sam
unicodecsv==0.14.1 # via -r requirements/edx/base.txt, edx-enterprise
unidiff==0.6.0 # via -r requirements/edx/testing.in, coverage-pytest-plugin
uritemplate==3.0.1 # via -r requirements/edx/base.txt, coreapi, drf-yasg
urllib3==1.26.4 # via -r requirements/edx/base.txt, elasticsearch, geoip2, requests, selenium, transifex-client
urllib3==1.26.4 # via -r requirements/edx/base.txt, elasticsearch, geoip2, requests, transifex-client
user-util==1.0.0 # via -r requirements/edx/base.txt
vine==1.3.0 # via -r requirements/edx/base.txt, amqp, celery
virtualenv==20.4.3 # via tox
Expand Down
6 changes: 0 additions & 6 deletions tests/fake_repos/tox_repo1/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,13 @@ passenv =
DJANGO_SETTINGS_MODULE
TOX_REPO1_CFG
FIREFOX_PROFILE_PATH
SELENIUM_BROWSER
SELENIUM_FIREFOX_PATH
SELENIUM_PORT
SELENIUM_VERSION
CI
setenv =
tests: DJANGO_SETTINGS_MODULE = tox_repo1.settings.test
acceptance: DJANGO_SETTINGS_MODULE = tox_repo1.settings.test
check_keywords: DJANGO_SETTINGS_MODULE = tox_repo1.settings.test
BOKCHOY_HEADLESS = true
NODE_BIN = ./node_modules/.bin
PATH=$PATH:$NODE_BIN
SELENIUM_BROWSER=firefox
deps =
-r{toxinidir}/requirements/test.txt
django22: Django>=2.2,<2.3
Expand Down
4 changes: 2 additions & 2 deletions tests/test_check_dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ def test_python_js_repo_dependency_check():

assert 'fs==2.0.18' in dependencies["pypi_all"]["list"]
assert "react-redux" in dependencies["js"]["list"]
assert dependencies["count"] == 350
assert dependencies["pypi_all"]["count"] == 298
assert dependencies["count"] == 348
assert dependencies["pypi_all"]["count"] == 296
assert dependencies["github"]["count"] == 15
assert dependencies["js.all"]["count"] == 10
assert dependencies["js"]["count"] == 26
Expand Down

0 comments on commit 3f1bc2a

Please sign in to comment.