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

No events v1 #90

Merged
merged 31 commits into from
Jan 15, 2019
Merged

No events v1 #90

Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
d992238
prepublish -> prepare / prepublishOnly.
rmarren1 Dec 12, 2018
d98520f
Lock dash>=0.32.2
T4rk1n Dec 17, 2018
55da61e
Regenerate
T4rk1n Dec 17, 2018
7e6f7d2
Update version and changelog.
T4rk1n Dec 17, 2018
ab1aaa4
Merge pull request #85 from plotly/fix-build
T4rk1n Dec 17, 2018
fa7e839
Improve npmignore
T4rk1n Dec 17, 2018
66a1c41
Add url to setup.py
T4rk1n Dec 17, 2018
9fd2e4c
Update changelog.
T4rk1n Dec 17, 2018
20df128
Add long_description.
T4rk1n Dec 17, 2018
ffafd9b
Merge pull request #86 from plotly/fix-ignores
T4rk1n Dec 17, 2018
c51ed1a
Merge pull request #83 from plotly/prepublish
rmarren1 Dec 21, 2018
37febab
lint generate-components
alexcjohnson Jan 6, 2019
173510e
npm test shortcut
alexcjohnson Jan 10, 2019
2f873da
ensure element list is unique
alexcjohnson Jan 10, 2019
887846f
remove events from generate-components script
alexcjohnson Jan 10, 2019
599d98c
rebuild
alexcjohnson Jan 10, 2019
a2e145e
update changelog
alexcjohnson Jan 10, 2019
bdfbb5c
add PR number to changelog for :hocho: events
alexcjohnson Jan 10, 2019
eb3c4de
lint scripts dir
alexcjohnson Jan 11, 2019
82695c1
simplify ci command & include lint
alexcjohnson Jan 11, 2019
f469338
bump version to 0.13.5
Jan 11, 2019
52b049d
set +e along with lint and test errors
alexcjohnson Jan 14, 2019
3ad1dd3
fix lint error only - still has test error
alexcjohnson Jan 14, 2019
2930061
remove set +e
alexcjohnson Jan 14, 2019
15d2891
set +e and +o pipefail - still failing test only, not lint
alexcjohnson Jan 14, 2019
e42be85
new approach: npm-run-all -> run-s
alexcjohnson Jan 14, 2019
f28aede
remove fake test error
alexcjohnson Jan 14, 2019
89a6d67
Merge pull request #89 from plotly/no-events
alexcjohnson Jan 15, 2019
b922988
Merge branch 'master' into no-events-v1
alexcjohnson Jan 15, 2019
305ad15
underscore more vars in init.py
alexcjohnson Jan 15, 2019
be67099
mention 0.x version bump in 1.0 branch changelog
alexcjohnson Jan 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions dash_html_components/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import os as _os
import sys as _sys
import dash as _dash
import json
import json as _json

from .version import __version__
from .version import __version__ # noqa: F401

# Module imports trigger a dash.development import, need to check this first
if not hasattr(_dash, 'development'):
Expand All @@ -25,7 +25,7 @@
_sys.exit(1)


from ._imports_ import *
from ._imports_ import * # noqa: F403
from ._imports_ import __all__


Expand All @@ -36,21 +36,21 @@

_basepath = _os.path.dirname(__file__)
_filepath = _os.path.abspath(_os.path.join(_basepath, 'package.json'))
with open(_filepath) as f:
package = json.load(f)
with open(_filepath) as _f:
_package = _json.load(_f)

js_package_name = package['name']
py_package_name = __name__
js_version = package['version']
_js_package_name = _package['name']
_py_package_name = __name__
_js_version = _package['version']

_js_dist = [
{
"relative_package_path": '{}.min.js'.format(py_package_name),
"dev_package_path": '{}.dev.js'.format(py_package_name),
"relative_package_path": '{}.min.js'.format(_py_package_name),
"dev_package_path": '{}.dev.js'.format(_py_package_name),
"external_url": (
"https://unpkg.com/{}@{}/{}/{}.min.js"
).format(js_package_name, js_version, py_package_name, py_package_name),
"namespace": py_package_name
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Marc-Andre-Rivet to get test_imports to pass (and therefore to keep package contents clean). I guess these tests hadn't been run since fix release, alpha 2 cf1256c?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh my.. thanks!

"https://unpkg.com/{0}@{1}/{2}/{2}.min.js"
).format(_js_package_name, _js_version, _py_package_name),
"namespace": _py_package_name
}
]

Expand Down