Skip to content

Do not merge: Work on fixing CI tests for fcollonval/issue3036 #3168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 22 commits into from
Closed

Do not merge: Work on fixing CI tests for fcollonval/issue3036 #3168

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a68ad6a
Refactoring to one JS package
Apr 8, 2021
e19d480
Update packaging
Apr 9, 2021
83e61de
Load plotly asynchronously
Apr 9, 2021
1bba54f
Fix packaging from scratch
Apr 9, 2021
01def03
Update doc
Apr 9, 2021
fc96705
Update CI
Apr 9, 2021
2ca063f
Fix setup dependencies
Apr 9, 2021
1dc74ca
Fix linter
Apr 9, 2021
8a29e75
Correct setup warning
Apr 9, 2021
ae247b0
Modernize CI
Apr 9, 2021
2f4d638
Back to lockfile v1
Apr 9, 2021
410c760
Increase executor RAM
Apr 9, 2021
7d0aaee
Install jupyterlab in tox env for packaging JS code
Apr 9, 2021
a41ab2b
Add jupyterlab in tox env of plotly pkg
Apr 9, 2021
c7e59b0
Update npm package-lock
Apr 9, 2021
ab9feef
Install jupyterlab with tox in root python
Apr 9, 2021
71fe11c
Skip building JS assets except in plotlyjs_dev_build
Apr 9, 2021
b2e5292
Condition packaged data on skip npm
Apr 9, 2021
fea5475
Fix update_package_data
Apr 9, 2021
73647ee
Reduce number of CI changes
Apr 9, 2021
191a548
Fix typo
fcollonval Apr 10, 2021
9876bf9
Merge remote-tracking branch 'origin/master' into fcollonval/issue3036
jonmmease Apr 23, 2021
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
Prev Previous commit
Next Next commit
Condition packaged data on skip npm
  • Loading branch information
Frédéric Collonval committed Apr 9, 2021
commit b2e529212b983d0bd64e75781a83d843905b30d6
2 changes: 1 addition & 1 deletion packages/python/plotly/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[build-system]
requires = ["jupyterlab~=3.0", "setuptools>=40.8.0", "wheel"]
requires = ["jupyterlab~=3.0;python_version>='3.6'", "setuptools>=40.8.0", "wheel"]
build-backend = "setuptools.build_meta"
41 changes: 20 additions & 21 deletions packages/python/plotly/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,26 @@ def update_package_data(distribution):
"""update package_data to catch changes during setup"""
build_py = distribution.get_command_obj("build_py")

# Add JupyterLab extension static files as their names are unknown
distribution.data_files.append(
(
"share/jupyter/labextensions/plotlywidget/static",
[os.path.join(labstatic, f) for f in os.listdir(labstatic)],
# JS assets will not be present if we are skip npm build
if not skip_npm:
distribution.data_files.append(
(
"share/jupyter/labextensions/plotlywidget",
["plotlywidget/labextension/package.json",],
),
(
"share/jupyter/labextensions/plotlywidget/static",
[os.path.join(labstatic, f) for f in os.listdir(labstatic)],
),
(
"share/jupyter/nbextensions/plotlywidget",
[
"plotlywidget/nbextension/extension.js",
"plotlywidget/nbextension/index.js",
"plotlywidget/nbextension/index.js.LICENSE.txt",
],
),
)
)

# re-init build_py options which load package_data
build_py.finalize_options()
Expand Down Expand Up @@ -531,21 +544,7 @@ def run(self):
],
"plotlywidget": ["nbextension/*", "labextension/*", "labextension/static/*"],
},
data_files=[
(
"share/jupyter/labextensions/plotlywidget",
["plotlywidget/labextension/package.json",],
),
(
"share/jupyter/nbextensions/plotlywidget",
[
"plotlywidget/nbextension/extension.js",
"plotlywidget/nbextension/index.js",
"plotlywidget/nbextension/index.js.LICENSE.txt",
],
),
("etc/jupyter/nbconfig/notebook.d", ["plotlywidget.json"]),
],
data_files=[("etc/jupyter/nbconfig/notebook.d", ["plotlywidget.json"]),],
install_requires=["retrying>=1.3.3", "six"],
zip_safe=False,
cmdclass=dict(
Expand Down