Skip to content
This repository was archived by the owner on Jun 4, 2024. It is now read-only.

Commit 2f55aa7

Browse files
harryturrharryturr
authored
merge dev into master 1.1.2 (#177)
1 parent eacbbfc commit 2f55aa7

File tree

163 files changed

+614
-203
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+614
-203
lines changed

‎.circleci/config.yml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ jobs:
44
python-2.7: &test-template
55
docker:
66
- image: circleci/python:2.7-stretch-node-browsers
7+
auth:
8+
username: dashautomation
9+
password: $DASH_PAT_DOCKERHUB
710
environment:
811
PYTHON_VERSION: py27
912
PERCY_ENABLE: 1
@@ -57,6 +60,9 @@ jobs:
5760
<<: *test-template
5861
docker:
5962
- image: circleci/python:3.6.9-stretch-node-browsers
63+
auth:
64+
username: dashautomation
65+
password: $DASH_PAT_DOCKERHUB
6066
environment:
6167
PYTHON_VERSION: py36
6268
PERCY_ENABLE: 0
@@ -65,6 +71,9 @@ jobs:
6571
<<: *test-template
6672
docker:
6773
- image: circleci/python:3.7.6-stretch-node-browsers
74+
auth:
75+
username: dashautomation
76+
password: $DASH_PAT_DOCKERHUB
6877
environment:
6978
PYTHON_VERSION: py37
7079
PERCY_ENABLE: 0
@@ -73,6 +82,12 @@ workflows:
7382
version: 2
7483
build:
7584
jobs:
76-
- python-2.7
77-
- python-3.6
78-
- python-3.7
85+
- python-2.7:
86+
context:
87+
- dash-docker-hub
88+
- python-3.6:
89+
context:
90+
- dash-docker-hub
91+
- python-3.7:
92+
context:
93+
- dash-docker-hub

‎CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@
22
All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

5+
## [1.1.2] - 2021-01-19
6+
### Fixed
7+
- [#169](https://github.com/plotly/dash-html-components/pull/169) - part of fixing dash import bug https://github.com/plotly/dash/issues/1143
8+
59
## [1.1.1] - 2020-09-03
6-
-Dash.jl Julia component generation
10+
- Dash.jl Julia component generation
711

812
## [1.1.0] - 2020-08-25
913
### Added

‎DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: dashHtmlComponents
22
Title: Vanilla HTML Components for 'Dash'
3-
Version: 1.1.1
3+
Version: 1.1.2
44
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.
55
Depends: R (>= 3.0.2)
66
Imports:

‎Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
name = "DashHtmlComponents"
33
uuid = "1b08a953-4be3-4667-9a23-24100242a84a"
44
authors = ["Chris Parmer <chris@plotly.com>"]
5-
version = "1.1.1"
5+
version = "1.1.2"
66

77
[deps]
88
DashBase = "03207cf0-e2b3-4b91-9ca8-690cf0fb507e"
99

1010
[compat]
1111
julia = "1.2"
12-
DashBase = ">=0.1"
12+
DashBase = "0.1"

‎R/internal.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.dashHtmlComponents_js_metadata <- function() {
22
deps_metadata <- list(`dash_html_components` = structure(list(name = "dash_html_components",
3-
version = "1.1.1", src = list(href = NULL,
3+
version = "1.1.2", src = list(href = NULL,
44
file = "deps"), meta = NULL,
55
script = 'dash_html_components.min.js',
66
stylesheet = NULL, head = NULL, attachment = NULL, package = "dashHtmlComponents",
77
all_files = FALSE), class = "html_dependency"),
88
`dash_html_components` = structure(list(name = "dash_html_components",
9-
version = "1.1.1", src = list(href = NULL,
9+
version = "1.1.2", src = list(href = NULL,
1010
file = "deps"), meta = NULL,
1111
script = 'dash_html_components.min.js.map',
1212
stylesheet = NULL, head = NULL, attachment = NULL, package = "dashHtmlComponents",

‎dash-info.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ r_examples:
651651
)
652652
)
653653
654-
# Include the following in a seperate CSS file in an
654+
# Include the following in a separate CSS file in an
655655
# `assets` directory in the root of your app.
656656
#
657657
# data:hover::after {

‎dash_html_components/A.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class A(Component):
3131
- media (string; optional): Specifies a hint of the media for which the linked resource was designed.
3232
- rel (string; optional): Specifies the relationship of the target object to the link object.
3333
- shape (string; optional)
34-
- 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)
34+
- 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)
3535
- accessKey (string; optional): Keyboard shortcut to activate or add focus to the element.
3636
- className (string; optional): Often used with CSS to style elements with common properties.
3737
- contentEditable (string; optional): Indicates whether the element's content is editable.

‎dash_html_components/Area.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class Area(Component):
3333
- media (string; optional): Specifies a hint of the media for which the linked resource was designed.
3434
- rel (string; optional): Specifies the relationship of the target object to the link object.
3535
- shape (string; optional)
36-
- 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)
36+
- 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)
3737
- accessKey (string; optional): Keyboard shortcut to activate or add focus to the element.
3838
- className (string; optional): Often used with CSS to style elements with common properties.
3939
- contentEditable (string; optional): Indicates whether the element's content is editable.

‎dash_html_components/Base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class Base(Component):
2626
- data-* (string; optional): A wildcard data attribute
2727
- aria-* (string; optional): A wildcard aria attribute
2828
- href (string; optional): The URL of a linked resource.
29-
- 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)
29+
- 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)
3030
- accessKey (string; optional): Keyboard shortcut to activate or add focus to the element.
3131
- className (string; optional): Often used with CSS to style elements with common properties.
3232
- contentEditable (string; optional): Indicates whether the element's content is editable.

‎dash_html_components/Form.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class Form(Component):
3333
- method (string; optional): Defines which HTTP method to use when submitting the form. Can be GET (default) or POST.
3434
- name (string; optional): Name of the element. For example used by the server to identify the fields in form submits.
3535
- noValidate (a value equal to: 'noValidate', 'novalidate', 'NOVALIDATE' | boolean; optional): This attribute indicates that the form shouldn't be validated when submitted.
36-
- 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)
36+
- 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)
3737
- accessKey (string; optional): Keyboard shortcut to activate or add focus to the element.
3838
- className (string; optional): Often used with CSS to style elements with common properties.
3939
- contentEditable (string; optional): Indicates whether the element's content is editable.

‎dash_html_components/__init__.py

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,14 @@
1616
__version__ = package['version']
1717

1818
# Module imports trigger a dash.development import, need to check this first
19-
if not hasattr(_dash, 'development'):
20-
print(
21-
"Dash was not successfully imported. Make sure you don't have a file "
22-
"named \n'dash.py' in your current directory.", file=_sys.stderr)
23-
_sys.exit(1)
24-
25-
# Must update to dash>=0.22.0 to use this version of dash-html-components
26-
if not hasattr(_dash.development.base_component, '_explicitize_args'):
27-
print("Please update the `dash` module to >= 0.22.0 to use this "
28-
"version of dash_html_components.\n"
29-
"You are using version {:s}".format(_dash.version.__version__),
30-
file=_sys.stderr)
19+
if not hasattr(_dash, '__plotly_dash') and not hasattr(_dash, 'development'):
20+
print("Dash was not successfully imported. Make sure you don't have a file "
21+
"named \n'dash.py' in your current directory.", file=_sys.stderr)
3122
_sys.exit(1)
3223

3324

34-
from ._imports_ import *
35-
from ._imports_ import __all__
25+
from ._imports_ import * # noqa: E402, F401, F403
26+
from ._imports_ import __all__ # noqa: E402
3627

3728

3829
_current_path = _os.path.dirname(_os.path.abspath(__file__))

‎dash_html_components/dash_html_components.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)