chore: remove bok-choy

openedx · Oct 16, 2023 · 079fbc3 · 079fbc3
1 parent 2720e82
commit 079fbc3
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 131 deletions.
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -32,10 +32,6 @@ 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
     # via
     #   -r requirements/base.txt
@@ -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
@@ -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
@@ -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
@@ -319,8 +302,6 @@ 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
@@ -330,7 +311,6 @@ six==1.16.0
     # via
     #   -r requirements/base.txt
     #   -r requirements/test.txt
-    #   bok-choy
     #   edx-lint
     #   fs
     #   fs-s3fs
@@ -409,6 +389,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
diff --git a/requirements/pip.txt b/requirements/pip.txt
@@ -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
diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -26,8 +26,6 @@ binaryornot==0.4.4
     # via
     #   -r requirements/test.txt
     #   cookiecutter
-bok-choy==0.7.1
-    # via -r requirements/test.txt
 boto3==1.28.63
     # via
     #   -r requirements/test.txt
@@ -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
@@ -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
@@ -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
@@ -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
@@ -266,18 +252,14 @@ s3transfer==0.7.0
     #   -r requirements/test.txt
     #   boto3
 selenium==3.4.1
-    # via
-    #   -r requirements/test.txt
-    #   bok-choy
-    #   needle
+    # via -r requirements/test.txt
 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
@@ -345,6 +327,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
diff --git a/requirements/test.in b/requirements/test.in
@@ -2,7 +2,6 @@
 -r base.txt
 
 acid-xblock
-bok_choy==0.7.1
 coverage
 ddt
 mock

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -22,8 +22,6 @@ binaryornot==0.4.4
     # via
     #   -r requirements/base.txt
     #   cookiecutter
-bok-choy==0.7.1
-    # via -r requirements/test.in
 boto3==1.28.63
     # via
     #   -r requirements/base.txt
@@ -98,7 +96,6 @@ lazy==1.6
     # via
     #   -r requirements/base.txt
     #   acid-xblock
-    #   bok-choy
     #   xblock
 lxml==4.9.3
     # via
@@ -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
@@ -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
@@ -198,18 +189,14 @@ s3transfer==0.7.0
     #   -r requirements/base.txt
     #   boto3
 selenium==3.4.1
-    # via
-    #   -r requirements/test.in
-    #   bok-choy
-    #   needle
+    # via -r requirements/test.in
 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
@@ -262,6 +249,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
diff --git a/workbench/test/selenium_test.py b/workbench/test/selenium_test.py
@@ -5,7 +5,6 @@
 
 
 import pytest
-from bok_choy.web_app_test import WebAppTest
 from selenium.webdriver.support.expected_conditions import staleness_of
 from selenium.webdriver.support.ui import WebDriverWait
 
@@ -15,7 +14,7 @@
 
 
 @pytest.mark.selenium
-class SeleniumTest(WebAppTest, StaticLiveServerTestCase):
+class SeleniumTest(StaticLiveServerTestCase):
     """
     Base test class that provides setUpClass and tearDownClass
     methods necessary for selenium testing.

diff --git a/workbench/test/test_filethumbs.py b/workbench/test/test_filethumbs.py
@@ -2,7 +2,6 @@
 
 
 import pytest
-from bok_choy.promise import EmptyPromise
 
 from workbench import scenarios
 from workbench.test.selenium_test import SeleniumTest
@@ -63,16 +62,16 @@ def test_three_thumbs_initial_state(self):
 
             # upvote
             thumb.find_element_by_css_selector('span.upvote').click()
-            _ = EmptyPromise(
-                lambda: int(thumb.find_element_by_css_selector(up_count_css).text) == initial_up + 1,
-                "upvote action succeeded"
-            ).fulfill()
+            # _ = EmptyPromise(
+            #     lambda: int(thumb.find_element_by_css_selector(up_count_css).text) == initial_up + 1,
+            #     "upvote action succeeded"
+            # ).fulfill()
             self.assertEqual(initial_down, int(thumb.find_element_by_css_selector(down_count_css).text))
 
             # downvote
             thumb.find_element_by_css_selector('span.downvote').click()
-            _ = EmptyPromise(
-                lambda: int(thumb.find_element_by_css_selector(down_count_css).text) == initial_down + 1,
-                "downvote action succeeded"
-            ).fulfill()
+            # _ = EmptyPromise(
+            #     lambda: int(thumb.find_element_by_css_selector(down_count_css).text) == initial_down + 1,
+            #     "downvote action succeeded"
+            # ).fulfill()
             self.assertEqual(initial_up + 1, int(thumb.find_element_by_css_selector(up_count_css).text))