Merge pull request #844 from noisycomputation/fix_lint_black

Fix string comparison for lint:black in package.json

Author: alexcjohnson

Diff for: packages/dash-core-components/package.json

@@ -12,10 +12,10 @@
   "homepage": "https://github.com/plotly/dash-core-components",
   "main": "dash_core_components/dash_core_components.min.js",
   "scripts": {
-    "private::format:black": "black --exclude dash_core_components .",
+    "private::format.black": "black --exclude dash_core_components .",
     "private::format.eslint": "eslint src tests --fix",
     "private::format.prettier": "prettier --config .prettierrc --write src/**/*.js tests/unit/*.js",
-    "private::lint:black": "if [[ PYTHON_VERSION != 'py27' ]]; then black --check --exclude dash_core_components .; fi",
+    "private::lint.black": "if [ \"$PYTHON_VERSION\" != \"py27\" ]; then black --check --exclude dash_core_components .; fi",
     "private::lint.eslint": "eslint src tests",
     "private::lint.flake8": "flake8 --exclude=dash_core_components,node_modules,venv",
     "private::lint.prettier": "prettier --config .prettierrc src/**/*.js tests/unit/*.js --list-different",

Diff for: packages/dash-core-components/setup.py

@@ -1,19 +1,19 @@
 from setuptools import setup
 import json
 
-with open('package.json') as f:
+with open("package.json") as f:
     package = json.load(f)
 
 package_name = str(package["name"].replace(" ", "_").replace("-", "_"))
 
 setup(
-    name='dash_core_components',
+    name="dash_core_components",
     version=package["version"],
-    author=package['author'],
-    author_email='[email protected]',
+    author=package["author"],
+    author_email="[email protected]",
     packages=[package_name],
     include_package_data=True,
-    license=package['license'],
+    license=package["license"],
     description=package.get("description", package_name),
-    install_requires=[]
+    install_requires=[],
 )

Diff for: packages/dash-core-components/tests/IntegrationTests.py

@@ -15,23 +15,22 @@
 
 
 class IntegrationTests(unittest.TestCase):
-
     @classmethod
     def setUpClass(cls):
         super(IntegrationTests, cls).setUpClass()
 
         options = Options()
         capabilities = DesiredCapabilities.CHROME
-        capabilities['loggingPrefs'] = {'browser': 'SEVERE'}
+        capabilities["loggingPrefs"] = {"browser": "SEVERE"}
 
-        if 'DASH_TEST_CHROMEPATH' in os.environ:
-            options.binary_location = os.environ['DASH_TEST_CHROMEPATH']
+        if "DASH_TEST_CHROMEPATH" in os.environ:
+            options.binary_location = os.environ["DASH_TEST_CHROMEPATH"]
 
-        cls.driver = webdriver.Chrome(options=options, desired_capabilities=capabilities)
+        cls.driver = webdriver.Chrome(
+            options=options, desired_capabilities=capabilities
+        )
         loader = percy.ResourceLoader(
-            webdriver=cls.driver,
-            base_url='/assets',
-            root_dir='tests/assets'
+            webdriver=cls.driver, base_url="/assets", root_dir="tests/assets"
         )
         cls.percy_runner = percy.Runner(loader=loader)
         cls.percy_runner.initialize_build()
@@ -45,8 +44,8 @@ def setUp(self):
         pass
 
     def tearDown(self):
-        if platform.system() == 'Windows':
-            requests.get('http://localhost:8050/stop')
+        if platform.system() == "Windows":
+            requests.get("http://localhost:8050/stop")
         else:
             self.server_process.terminate()
 
@@ -60,8 +59,8 @@ def startServer(self, app):
         :type app: dash.Dash
         :return:
         """
-        if 'DASH_TEST_PROCESSES' in os.environ:
-            processes = int(os.environ['DASH_TEST_PROCESSES'])
+        if "DASH_TEST_PROCESSES" in os.environ:
+            processes = int(os.environ["DASH_TEST_PROCESSES"])
         else:
             processes = 4
 
@@ -76,29 +75,25 @@ def run():
                 use_reloader=False,
                 use_debugger=True,
                 dev_tools_hot_reload=False,
-                dev_tools_ui=False
+                dev_tools_ui=False,
             )
 
         def run_windows():
             app.scripts.config.serve_locally = True
             app.css.config.serve_locally = True
 
-            @app.server.route('/stop')
+            @app.server.route("/stop")
             def _stop_server_windows():
-                stopper = flask.request.environ['werkzeug.server.shutdown']
+                stopper = flask.request.environ["werkzeug.server.shutdown"]
                 stopper()
-                return 'stop'
+                return "stop"
 
-            app.run_server(
-                port=8050,
-                debug=False,
-                threaded=True
-            )
+            app.run_server(port=8050, debug=False, threaded=True)
 
         # Run on a separate process so that it doesn't block
 
         system = platform.system()
-        if system == 'Windows':
+        if system == "Windows":
             # multiprocess can't pickle an inner func on windows (closure are not serializable by default on windows)
             self.server_thread = threading.Thread(target=run_windows)
             self.server_thread.start()
@@ -109,7 +104,7 @@ def _stop_server_windows():
 
         # Visit the dash page
         self.driver.implicitly_wait(2)
-        self.driver.get('http://localhost:8050')
+        self.driver.get("http://localhost:8050")
 
     def clear_log(self):
         entries = self.driver.get_log("browser")

Diff for: packages/dash-core-components/tests/integration/calendar/test_calendar_props.py

@@ -31,17 +31,15 @@ def test_cdpr001_date_clearable_true_works(dash_dcc):
 
     close_btn.click()
     start_date, end_date = dash_dcc.get_date_range("dpr")
-    assert (
-        not start_date and not end_date
-    ), "both start and end dates should be cleared"
+    assert not start_date and not end_date, "both start and end dates should be cleared"
 
     # DPS
     selected = dash_dcc.select_date_single("dps", day="1")
 
     assert selected, "single date should get a value"
     close_btn = dash_dcc.wait_for_element("#dps button")
     close_btn.click()
-    single_date, = dash_dcc.get_date_range("dps")
+    (single_date,) = dash_dcc.get_date_range("dps")
     assert not single_date, "date should be cleared"
 
 

Diff for: packages/dash-core-components/tests/integration/calendar/test_date_picker_range.py

@@ -7,14 +7,16 @@
 
 def test_dtpr001_initial_month_provided(dash_dcc):
     app = dash.Dash(__name__)
-    app.layout = html.Div([
-        dcc.DatePickerRange(
-            id="dps-initial-month",
-            min_date_allowed=datetime(2010, 1, 1),
-            max_date_allowed=datetime(2099, 12, 31),
-            initial_visible_month=datetime(2019, 10, 28)
-        )
-    ])
+    app.layout = html.Div(
+        [
+            dcc.DatePickerRange(
+                id="dps-initial-month",
+                min_date_allowed=datetime(2010, 1, 1),
+                max_date_allowed=datetime(2099, 12, 31),
+                initial_visible_month=datetime(2019, 10, 28),
+            )
+        ]
+    )
 
     dash_dcc.start_server(app)
 
@@ -24,21 +26,23 @@ def test_dtpr001_initial_month_provided(dash_dcc):
     date_picker_start.click()
 
     dash_dcc.wait_for_text_to_equal(
-        '#dps-initial-month .CalendarMonth.CalendarMonth_1[data-visible=true] strong',
-        'October 2019',
-        1
+        "#dps-initial-month .CalendarMonth.CalendarMonth_1[data-visible=true] strong",
+        "October 2019",
+        1,
     )
 
 
 def test_dtpr002_no_initial_month_min_date(dash_dcc):
     app = dash.Dash(__name__)
-    app.layout = html.Div([
-        dcc.DatePickerRange(
-            id="dps-initial-month",
-            min_date_allowed=datetime(2010, 1, 1),
-            max_date_allowed=datetime(2099, 12, 31)
-        )
-    ])
+    app.layout = html.Div(
+        [
+            dcc.DatePickerRange(
+                id="dps-initial-month",
+                min_date_allowed=datetime(2010, 1, 1),
+                max_date_allowed=datetime(2099, 12, 31),
+            )
+        ]
+    )
 
     dash_dcc.start_server(app)
 
@@ -48,20 +52,22 @@ def test_dtpr002_no_initial_month_min_date(dash_dcc):
     date_picker_start.click()
 
     dash_dcc.wait_for_text_to_equal(
-        '#dps-initial-month .CalendarMonth.CalendarMonth_1[data-visible=true] strong',
-        'January 2010'
+        "#dps-initial-month .CalendarMonth.CalendarMonth_1[data-visible=true] strong",
+        "January 2010",
     )
 
 
 def test_dtpr003_no_initial_month_no_min_date_start_date(dash_dcc):
     app = dash.Dash(__name__)
-    app.layout = html.Div([
-        dcc.DatePickerRange(
-            id="dps-initial-month",
-            start_date=datetime(2019, 8, 13),
-            max_date_allowed=datetime(2099, 12, 31)
-        )
-    ])
+    app.layout = html.Div(
+        [
+            dcc.DatePickerRange(
+                id="dps-initial-month",
+                start_date=datetime(2019, 8, 13),
+                max_date_allowed=datetime(2099, 12, 31),
+            )
+        ]
+    )
 
     dash_dcc.start_server(app)
 
@@ -71,6 +77,6 @@ def test_dtpr003_no_initial_month_no_min_date_start_date(dash_dcc):
     date_picker_start.click()
 
     dash_dcc.wait_for_text_to_equal(
-        '#dps-initial-month .CalendarMonth.CalendarMonth_1[data-visible=true] strong',
-        'August 2019'
+        "#dps-initial-month .CalendarMonth.CalendarMonth_1[data-visible=true] strong",
+        "August 2019",
     )

Diff for: packages/dash-core-components/tests/integration/calendar/test_date_picker_single.py

@@ -17,8 +17,7 @@ def test_dtps001_simple_click(dash_dcc):
                 id="dps",
                 min_date_allowed=datetime(2010, 1, 1),
                 max_date_allowed=datetime(2099, 12, 31),
-                initial_visible_month=datetime.today().date()
-                - timedelta(days=1),
+                initial_visible_month=datetime.today().date() - timedelta(days=1),
                 day_size=47,
             ),
         ],
@@ -65,11 +64,8 @@ def test_dtps010_local_and_session_persistence(dash_dcc):
         session = dash_dcc.select_date_single("dps-session", index=idx)
         dash_dcc.wait_for_page()
         assert (
-            dash_dcc.find_element("#dps-local input").get_attribute("value")
-            == local
-            and dash_dcc.find_element("#dps-session input").get_attribute(
-                "value"
-            )
+            dash_dcc.find_element("#dps-local input").get_attribute("value") == local
+            and dash_dcc.find_element("#dps-session input").get_attribute("value")
             == session
         ), "the date value should be consistent after refresh"
 
@@ -90,8 +86,7 @@ def cb(clicks):
                     id="dps-memory",
                     min_date_allowed=datetime(2010, 1, 1),
                     max_date_allowed=datetime(2099, 12, 31),
-                    initial_visible_month=datetime.today().date()
-                    - timedelta(days=1),
+                    initial_visible_month=datetime.today().date() - timedelta(days=1),
                     persistence=True,
                     persistence_type="memory",
                     day_size=47,
@@ -100,8 +95,7 @@ def cb(clicks):
                     id="dps-none",
                     min_date_allowed=datetime(2010, 1, 1),
                     max_date_allowed=datetime(2099, 12, 31),
-                    initial_visible_month=datetime.today().date()
-                    - timedelta(days=1),
+                    initial_visible_month=datetime.today().date() - timedelta(days=1),
                     day_size=47,
                 ),
             ]
@@ -120,28 +114,29 @@ def cb(clicks):
     assert dash_dcc.wait_for_text_to_equal("#out", "switched")
     switch.click()
     assert (
-        dash_dcc.find_element("#dps-memory input").get_attribute("value")
-        == memorized
+        dash_dcc.find_element("#dps-memory input").get_attribute("value") == memorized
     )
     switched = dash_dcc.find_element("#dps-none input").get_attribute("value")
     assert switched != amnesiaed and switched == ""
 
 
 def test_dtps012_initial_month(dash_dcc):
     app = dash.Dash(__name__)
-    app.layout = html.Div([
-        dcc.DatePickerSingle(
-            id="dps-initial-month",
-            min_date_allowed=datetime(2010, 1, 1),
-            max_date_allowed=datetime(2099, 12, 31)
-        )
-    ])
+    app.layout = html.Div(
+        [
+            dcc.DatePickerSingle(
+                id="dps-initial-month",
+                min_date_allowed=datetime(2010, 1, 1),
+                max_date_allowed=datetime(2099, 12, 31),
+            )
+        ]
+    )
 
     dash_dcc.start_server(app)
 
-    date_picker = dash_dcc.find_element('#dps-initial-month')
+    date_picker = dash_dcc.find_element("#dps-initial-month")
     date_picker.click()
     dash_dcc.wait_for_text_to_equal(
-        '#dps-initial-month .CalendarMonth.CalendarMonth_1[data-visible=true] strong',
-        'January 2010'
+        "#dps-initial-month .CalendarMonth.CalendarMonth_1[data-visible=true] strong",
+        "January 2010",
     )