Skip to content

V4 alpha2 release #1620

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.

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

Merged
merged 7 commits into from
Jun 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/python/chart-studio/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016-2018 Plotly, Inc
Copyright (c) 2016-2019 Plotly, Inc

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
1 change: 1 addition & 0 deletions packages/python/chart-studio/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Package for interfacing with the plotly's Chart Studio
8 changes: 7 additions & 1 deletion packages/python/chart-studio/chart_studio/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
from __future__ import absolute_import
from chart_studio import (plotly, dashboard_objs, grid_objs, session)
from chart_studio import (
plotly,
dashboard_objs,
grid_objs,
session,
tools,
)
4 changes: 2 additions & 2 deletions packages/python/chart-studio/recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ requirements:
{% endfor %}

test:
imports:
- plotly_express
# imports:
# - chart_studio

about:
home: {{ sdata['url'] }}
Expand Down
4 changes: 1 addition & 3 deletions packages/python/chart-studio/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,14 @@ def readme():
maintainer_email="[email protected]",
url="https://plot.ly/python/",
project_urls={"Github": "https://github.com/plotly/plotly.py"},
description="An open-source, interactive graphing library for Python",
description="Utilities for interfacing with plotly's Chart Studio",
long_description=readme(),
long_description_content_type="text/markdown",
classifiers=[
"Development Status :: 5 - Production/Stable",
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/python/plotly-geo/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016-2018 Plotly, Inc
Copyright (c) 2016-2019 Plotly, Inc

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
1 change: 1 addition & 0 deletions packages/python/plotly-geo/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Package containing the geo shape files used by plotly.py
2 changes: 1 addition & 1 deletion packages/python/plotly-geo/recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ requirements:

test:
imports:
- plotly_express
- _plotly_geo

about:
home: {{ sdata['url'] }}
Expand Down
4 changes: 1 addition & 3 deletions packages/python/plotly-geo/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,14 @@ def readme():
maintainer_email="[email protected]",
url="https://plot.ly/python/",
project_urls={"Github": "https://github.com/plotly/plotly.py"},
description="",
description="geo shape files for use with plotly.py",
long_description=readme(),
long_description_content_type="text/markdown",
classifiers=[
"Development Status :: 5 - Production/Stable",
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/python/plotly/_plotly_future_/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def _chart_studio_warning(submodule):
def _chart_studio_error(submodule):
raise ImportError("""
The plotly.{submodule} module is deprecated,
please install the chart_studio package and use the
please install the chart-studio package and use the
chart_studio.{submodule} module instead.
""".format(submodule=submodule))

Expand Down
8 changes: 7 additions & 1 deletion packages/python/plotly/plotly/data/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,10 @@ def _get_dataset(d):
import pandas
import os

return pandas.read_csv(os.path.join(os.path.dirname(__file__), d + ".csv.gz"))
return pandas.read_csv(
os.path.join(
os.path.dirname(os.path.dirname(__file__)),
'package_data',
'datasets',
d + ".csv.gz")
)
4 changes: 3 additions & 1 deletion packages/python/plotly/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,9 @@ def run(self):
'_plotly_utils',
'_plotly_future_',
] + graph_objs_packages + validator_packages,
package_data={'plotly': ['package_data/*', 'package_data/templates/*'],
package_data={'plotly': ['package_data/*',
'package_data/templates/*',
'package_data/datasets/*'],
'plotlywidget': ['static/extension.js',
'static/index.js']},
data_files=[
Expand Down