merge dev into master 1.1.2

.circleci/config.yml

@@ -4,6 +4,9 @@ jobs:
   python-2.7: &test-template
     docker:
       - image: circleci/python:2.7-stretch-node-browsers
+        auth:
+          username: dashautomation
+          password: $DASH_PAT_DOCKERHUB
         environment:
           PYTHON_VERSION: py27
           PERCY_ENABLE: 1
@@ -57,6 +60,9 @@ jobs:
     <<: *test-template
     docker:
       - image: circleci/python:3.6.9-stretch-node-browsers
+        auth:
+          username: dashautomation
+          password: $DASH_PAT_DOCKERHUB
         environment:
           PYTHON_VERSION: py36
           PERCY_ENABLE: 0
@@ -65,6 +71,9 @@ jobs:
     <<: *test-template
     docker:
       - image: circleci/python:3.7.6-stretch-node-browsers
+        auth:
+          username: dashautomation
+          password: $DASH_PAT_DOCKERHUB
         environment:
           PYTHON_VERSION: py37
           PERCY_ENABLE: 0
@@ -73,6 +82,12 @@ workflows:
   version: 2
   build:
     jobs:
-      - python-2.7
-      - python-3.6
-      - python-3.7
+      - python-2.7:
+          context:
+            - dash-docker-hub
+      - python-3.6:
+          context:
+            - dash-docker-hub
+      - python-3.7:
+          context:
+            - dash-docker-hub

CHANGELOG.md

@@ -2,8 +2,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.1.2] - 2021-01-19
+### Fixed
+- [#169](https://github.com/plotly/dash-html-components/pull/169) - part of fixing dash import bug https://github.com/plotly/dash/issues/1143
+
 ## [1.1.1] - 2020-09-03
--Dash.jl Julia component generation
+- Dash.jl Julia component generation
 
 ## [1.1.0] - 2020-08-25
 ### Added

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: dashHtmlComponents
 Title: Vanilla HTML Components for 'Dash'
-Version: 1.1.1
+Version: 1.1.2
 Description: 'Dash' is a web application framework that provides pure Python and R abstraction around HTML, CSS, and JavaScript. Instead of writing HTML or using an HTML templating engine, you compose your layout using R functions within the 'dashHtmlComponents' package. The source for this package is on GitHub: plotly/dash-html-components.
 Depends: R (>= 3.0.2)
 Imports: 

Project.toml

@@ -2,11 +2,11 @@
 name = "DashHtmlComponents"
 uuid = "1b08a953-4be3-4667-9a23-24100242a84a"
 authors = ["Chris Parmer <chris@plotly.com>"]
-version = "1.1.1"
+version = "1.1.2"
 
 [deps]
 DashBase = "03207cf0-e2b3-4b91-9ca8-690cf0fb507e"
 
 [compat]
 julia = "1.2"
-DashBase = ">=0.1"
+DashBase = "0.1"

R/internal.R

@@ -1,12 +1,12 @@
 .dashHtmlComponents_js_metadata <- function() {
 deps_metadata <- list(`dash_html_components` = structure(list(name = "dash_html_components",
-version = "1.1.1", src = list(href = NULL,
+version = "1.1.2", src = list(href = NULL,
 file = "deps"), meta = NULL,
 script = 'dash_html_components.min.js',
 stylesheet = NULL, head = NULL, attachment = NULL, package = "dashHtmlComponents",
 all_files = FALSE), class = "html_dependency"),
 `dash_html_components` = structure(list(name = "dash_html_components",
-version = "1.1.1", src = list(href = NULL,
+version = "1.1.2", src = list(href = NULL,
 file = "deps"), meta = NULL,
 script = 'dash_html_components.min.js.map',
 stylesheet = NULL, head = NULL, attachment = NULL, package = "dashHtmlComponents",

dash-info.yaml

@@ -651,7 +651,7 @@ r_examples:
                 )
               )
 
-              # Include the following in a seperate CSS file in an
+              # Include the following in a separate CSS file in an
               # `assets` directory in the root of your app.
               #
               # data:hover::after {

dash_html_components/A.py

@@ -31,7 +31,7 @@ class A(Component):
 - media (string; optional): Specifies a hint of the media for which the linked resource was designed.
 - rel (string; optional): Specifies the relationship of the target object to the link object.
 - shape (string; optional)
-- target (string; optional): Specifies where to open the linked document (in the case of an <a> element) or where to display the response recieved (in the case of a <form> element)
+- target (string; optional): Specifies where to open the linked document (in the case of an <a> element) or where to display the response received (in the case of a <form> element)
 - accessKey (string; optional): Keyboard shortcut to activate or add focus to the element.
 - className (string; optional): Often used with CSS to style elements with common properties.
 - contentEditable (string; optional): Indicates whether the element's content is editable.

dash_html_components/Area.py

@@ -33,7 +33,7 @@ class Area(Component):
 - media (string; optional): Specifies a hint of the media for which the linked resource was designed.
 - rel (string; optional): Specifies the relationship of the target object to the link object.
 - shape (string; optional)
-- target (string; optional): Specifies where to open the linked document (in the case of an <a> element) or where to display the response recieved (in the case of a <form> element)
+- target (string; optional): Specifies where to open the linked document (in the case of an <a> element) or where to display the response received (in the case of a <form> element)
 - accessKey (string; optional): Keyboard shortcut to activate or add focus to the element.
 - className (string; optional): Often used with CSS to style elements with common properties.
 - contentEditable (string; optional): Indicates whether the element's content is editable.

dash_html_components/Base.py

@@ -26,7 +26,7 @@ class Base(Component):
 - data-* (string; optional): A wildcard data attribute
 - aria-* (string; optional): A wildcard aria attribute
 - href (string; optional): The URL of a linked resource.
-- target (string; optional): Specifies where to open the linked document (in the case of an <a> element) or where to display the response recieved (in the case of a <form> element)
+- target (string; optional): Specifies where to open the linked document (in the case of an <a> element) or where to display the response received (in the case of a <form> element)
 - accessKey (string; optional): Keyboard shortcut to activate or add focus to the element.
 - className (string; optional): Often used with CSS to style elements with common properties.
 - contentEditable (string; optional): Indicates whether the element's content is editable.

dash_html_components/Form.py

@@ -33,7 +33,7 @@ class Form(Component):
 - method (string; optional): Defines which HTTP method to use when submitting the form. Can be GET (default) or POST.
 - name (string; optional): Name of the element. For example used by the server to identify the fields in form submits.
 - noValidate (a value equal to: 'noValidate', 'novalidate', 'NOVALIDATE' | boolean; optional): This attribute indicates that the form shouldn't be validated when submitted.
-- target (string; optional): Specifies where to open the linked document (in the case of an <a> element) or where to display the response recieved (in the case of a <form> element)
+- target (string; optional): Specifies where to open the linked document (in the case of an <a> element) or where to display the response received (in the case of a <form> element)
 - accessKey (string; optional): Keyboard shortcut to activate or add focus to the element.
 - className (string; optional): Often used with CSS to style elements with common properties.
 - contentEditable (string; optional): Indicates whether the element's content is editable.

dash_html_components/__init__.py

@@ -16,23 +16,14 @@
 __version__ = package['version']
 
 # Module imports trigger a dash.development import, need to check this first
-if not hasattr(_dash, 'development'):
-    print(
-        "Dash was not successfully imported. Make sure you don't have a file "
-        "named \n'dash.py' in your current directory.", file=_sys.stderr)
-    _sys.exit(1)
-
-# Must update to dash>=0.22.0 to use this version of dash-html-components
-if not hasattr(_dash.development.base_component, '_explicitize_args'):
-    print("Please update the `dash` module to >= 0.22.0 to use this "
-          "version of dash_html_components.\n"
-          "You are using version {:s}".format(_dash.version.__version__),
-          file=_sys.stderr)
+if not hasattr(_dash, '__plotly_dash') and not hasattr(_dash, 'development'):
+    print("Dash was not successfully imported. Make sure you don't have a file "
+          "named \n'dash.py' in your current directory.", file=_sys.stderr)
     _sys.exit(1)
 
 
-from ._imports_ import *
-from ._imports_ import __all__
+from ._imports_ import *  # noqa: E402, F401, F403
+from ._imports_ import __all__  # noqa: E402
 
 
 _current_path = _os.path.dirname(_os.path.abspath(__file__))