diff --git a/packages/python/chart-studio/LICENSE.txt b/packages/python/chart-studio/LICENSE.txt index 98b37b6f421..359e5d343ef 100644 --- a/packages/python/chart-studio/LICENSE.txt +++ b/packages/python/chart-studio/LICENSE.txt @@ -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 diff --git a/packages/python/chart-studio/README.md b/packages/python/chart-studio/README.md index e69de29bb2d..a9860520407 100644 --- a/packages/python/chart-studio/README.md +++ b/packages/python/chart-studio/README.md @@ -0,0 +1 @@ +Package for interfacing with the plotly's Chart Studio diff --git a/packages/python/chart-studio/chart_studio/__init__.py b/packages/python/chart-studio/chart_studio/__init__.py index c1adbe629b9..494797371e0 100644 --- a/packages/python/chart-studio/chart_studio/__init__.py +++ b/packages/python/chart-studio/chart_studio/__init__.py @@ -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, +) diff --git a/packages/python/chart-studio/recipe/meta.yaml b/packages/python/chart-studio/recipe/meta.yaml index d5bffcd2de0..33dbf0cbf03 100644 --- a/packages/python/chart-studio/recipe/meta.yaml +++ b/packages/python/chart-studio/recipe/meta.yaml @@ -22,8 +22,8 @@ requirements: {% endfor %} test: - imports: - - plotly_express +# imports: +# - chart_studio about: home: {{ sdata['url'] }} diff --git a/packages/python/chart-studio/setup.py b/packages/python/chart-studio/setup.py index a4527fddcbd..801221a95f8 100644 --- a/packages/python/chart-studio/setup.py +++ b/packages/python/chart-studio/setup.py @@ -17,7 +17,7 @@ def readme(): maintainer_email="jon@plot.ly", 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=[ @@ -25,8 +25,6 @@ def readme(): "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", diff --git a/packages/python/plotly-geo/LICENSE.txt b/packages/python/plotly-geo/LICENSE.txt index 98b37b6f421..359e5d343ef 100644 --- a/packages/python/plotly-geo/LICENSE.txt +++ b/packages/python/plotly-geo/LICENSE.txt @@ -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 diff --git a/packages/python/plotly-geo/README.md b/packages/python/plotly-geo/README.md index e69de29bb2d..a23077d3510 100644 --- a/packages/python/plotly-geo/README.md +++ b/packages/python/plotly-geo/README.md @@ -0,0 +1 @@ +Package containing the geo shape files used by plotly.py \ No newline at end of file diff --git a/packages/python/plotly-geo/recipe/meta.yaml b/packages/python/plotly-geo/recipe/meta.yaml index 13ead67dd61..6602d5baaf4 100644 --- a/packages/python/plotly-geo/recipe/meta.yaml +++ b/packages/python/plotly-geo/recipe/meta.yaml @@ -23,7 +23,7 @@ requirements: test: imports: - - plotly_express + - _plotly_geo about: home: {{ sdata['url'] }} diff --git a/packages/python/plotly-geo/setup.py b/packages/python/plotly-geo/setup.py index d9d92b00fdf..9f82934f7ec 100644 --- a/packages/python/plotly-geo/setup.py +++ b/packages/python/plotly-geo/setup.py @@ -17,7 +17,7 @@ def readme(): maintainer_email="jon@plot.ly", 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=[ @@ -25,8 +25,6 @@ def readme(): "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", diff --git a/packages/python/plotly/_plotly_future_/__init__.py b/packages/python/plotly/_plotly_future_/__init__.py index 64b17e6c194..26b52ef271b 100644 --- a/packages/python/plotly/_plotly_future_/__init__.py +++ b/packages/python/plotly/_plotly_future_/__init__.py @@ -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)) diff --git a/packages/python/plotly/plotly/data/__init__.py b/packages/python/plotly/plotly/data/__init__.py index 2a83f8719ff..5e61d319503 100644 --- a/packages/python/plotly/plotly/data/__init__.py +++ b/packages/python/plotly/plotly/data/__init__.py @@ -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") + ) diff --git a/packages/python/plotly/setup.py b/packages/python/plotly/setup.py index 271e7d6035c..99460dc24fa 100644 --- a/packages/python/plotly/setup.py +++ b/packages/python/plotly/setup.py @@ -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=[