Skip to content

Restructure repo with a top-level packages/ directory #1604

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 8 commits into from
Jun 13, 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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
58 changes: 29 additions & 29 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
command: 'sudo pip install tox'
- run:
name: Test with tox
command: 'cd plotly-package; tox -e py27-core'
command: 'cd packages/python/plotly; tox -e py27-core'
no_output_timeout: 20m

python-3.5-core:
Expand All @@ -31,7 +31,7 @@ jobs:
command: 'sudo pip install tox'
- run:
name: Test with tox
command: 'cd plotly-package; tox -e py35-core'
command: 'cd packages/python/plotly; tox -e py35-core'
no_output_timeout: 20m

python-3.6-core:
Expand All @@ -47,7 +47,7 @@ jobs:
command: 'sudo pip install tox'
- run:
name: Test with tox
command: 'cd plotly-package; tox -e py36-core'
command: 'cd packages/python/plotly; tox -e py36-core'
no_output_timeout: 20m

python-3.7-core:
Expand All @@ -63,7 +63,7 @@ jobs:
command: 'sudo pip install tox'
- run:
name: Test with tox
command: 'cd plotly-package; tox -e py37-core'
command: 'cd packages/python/plotly; tox -e py37-core'
no_output_timeout: 20m

# Optional
Expand All @@ -80,11 +80,11 @@ jobs:
command: 'sudo pip install tox'
- run:
name: Install npm dependencies
command: cd plotly-package/plotly/tests/test_optional/test_jupyter && npm install
command: cd packages/python/plotly/plotly/tests/test_optional/test_jupyter && npm install
no_output_timeout: 20m
- run:
name: Test with tox
command: 'cd plotly-package; tox -e py27-optional'
command: 'cd packages/python/plotly; tox -e py27-optional'
no_output_timeout: 20m

python-3.5-optional:
Expand All @@ -100,11 +100,11 @@ jobs:
command: 'sudo pip install tox'
- run:
name: Install npm dependencies
command: cd plotly-package/plotly/tests/test_optional/test_jupyter && npm install
command: cd packages/python/plotly/plotly/tests/test_optional/test_jupyter && npm install
no_output_timeout: 20m
- run:
name: Test with tox
command: 'cd plotly-package; tox -e py35-optional'
command: 'cd packages/python/plotly; tox -e py35-optional'
no_output_timeout: 20m

python-3.6-optional:
Expand All @@ -120,11 +120,11 @@ jobs:
command: 'sudo pip install tox'
- run:
name: Install npm dependencies
command: cd plotly-package/plotly/tests/test_optional/test_jupyter && npm install
command: cd packages/python/plotly/plotly/tests/test_optional/test_jupyter && npm install
no_output_timeout: 20m
- run:
name: Test with tox
command: 'cd plotly-package; tox -e py36-optional'
command: 'cd packages/python/plotly; tox -e py36-optional'
no_output_timeout: 20m

python-3.7-optional:
Expand All @@ -140,11 +140,11 @@ jobs:
command: 'sudo pip install tox'
- run:
name: Install npm dependencies
command: cd plotly-package/plotly/tests/test_optional/test_jupyter && npm install
command: cd packages/python/plotly/plotly/tests/test_optional/test_jupyter && npm install
no_output_timeout: 20m
- run:
name: Test with tox
command: 'cd plotly-package; tox -e py37-optional'
command: 'cd packages/python/plotly; tox -e py37-optional'
no_output_timeout: 20m

# Plot.ly
Expand All @@ -161,7 +161,7 @@ jobs:
command: 'sudo pip install tox'
- run:
name: Test with tox
command: 'cd chart-studio-package; tox -e py27-plot_ly'
command: 'cd packages/python/chart-studio; tox -e py27-plot_ly'
no_output_timeout: 20m

python-3.5-plot_ly:
Expand All @@ -177,7 +177,7 @@ jobs:
command: 'sudo pip install tox'
- run:
name: Test with tox
command: 'cd chart-studio-package; tox -e py35-plot_ly'
command: 'cd packages/python/chart-studio; tox -e py35-plot_ly'
no_output_timeout: 20m

python-3.7-plot_ly:
Expand All @@ -193,7 +193,7 @@ jobs:
command: 'sudo pip install tox'
- run:
name: Test with tox
command: 'cd chart-studio-package; tox -e py37-plot_ly'
command: 'cd packages/python/chart-studio; tox -e py37-plot_ly'
no_output_timeout: 20m

python-2-7-orca:
Expand All @@ -220,8 +220,8 @@ jobs:
command: |
. /home/circleci/miniconda/etc/profile.d/conda.sh
conda activate circle_optional
pytest --disable-warnings plotly-package/plotly/tests/test_core
pytest plotly-package/plotly/tests/test_orca
pytest --disable-warnings packages/python/plotly/plotly/tests/test_core
pytest packages/python/plotly/plotly/tests/test_orca

- store_artifacts:
path: plotly/tests/test_orca/images/linux/failed
Expand Down Expand Up @@ -250,8 +250,8 @@ jobs:
command: |
. /home/circleci/miniconda/etc/profile.d/conda.sh
conda activate circle_optional
pytest --disable-warnings plotly-package/plotly/tests/test_core
pytest plotly-package/plotly/tests/test_orca
pytest --disable-warnings packages/python/plotly/plotly/tests/test_core
pytest packages/python/plotly/plotly/tests/test_orca

- store_artifacts:
path: plotly/tests/test_orca/images/linux/failed
Expand Down Expand Up @@ -280,8 +280,8 @@ jobs:
command: |
. /home/circleci/miniconda/etc/profile.d/conda.sh
conda activate circle_optional
pytest --disable-warnings plotly-package/plotly/tests/test_core
pytest plotly-package/plotly/tests/test_orca
pytest --disable-warnings packages/python/plotly/plotly/tests/test_core
pytest packages/python/plotly/plotly/tests/test_orca

- store_artifacts:
path: plotly/tests/test_orca/images/linux/failed
Expand All @@ -300,44 +300,44 @@ jobs:
command: 'sudo pip install tox requests yapf pytz decorator retrying inflect'
- run:
name: Update plotlywidget version
command: 'cd plotly-package; python setup.py updateplotlywidgetversion'
command: 'cd packages/python/plotly; python setup.py updateplotlywidgetversion'
- run:
name: Update plotly.js to dev
command: 'cd plotly-package; python setup.py updateplotlyjsdev'
command: 'cd packages/python/plotly; python setup.py updateplotlyjsdev'
- run:
name: Test with tox
command: |
cd plotly-package
cd packages/python/plotly
locale
tox -e py37-core -- -a '!nodev'
no_output_timeout: 20m
- run:
name: Commit
command: |
cd plotly-package
cd packages/python/plotly
sudo mkdir /dist
git config --global user.email "[email protected]"
git config --global user.name "Your Name"
git add -A
git commit -m "Codegen"
when: always
- run:
name: Build source distribution package
name: Build source distribution packages
command: |
cd plotly-package
cd packages/python/plotly
python setup.py sdist
sudo cp dist/* /dist
when: always
- run:
name: npm-pack widget
command: |
cd js/
cd packages/javascript/plotlywidget/
npm install webpack
npm pack
sudo cp ./plotlywidget* /dist
when: always
- store_artifacts:
path: plotly-package/dist
path: packages/python/plotly/dist

workflows:
version: 2
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ plotly/presentation_objs/

.idea

js/node_modules/
node_modules/

.pytest_cache

Expand Down
3 changes: 0 additions & 3 deletions package-lock.json

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module.exports = [
output: {
filename: 'extension.js',
path: path.resolve(
__dirname, '..', 'plotly-package', 'plotlywidget', 'static'),
__dirname, '..', '..', 'python', 'plotly', 'plotlywidget', 'static'),
libraryTarget: 'amd'
}
},
Expand All @@ -36,7 +36,7 @@ module.exports = [
output: {
filename: 'index.js',
path: path.resolve(
__dirname, '..', 'plotly-package', 'plotlywidget', 'static'),
__dirname, '..', '..', 'python', 'plotly', 'plotlywidget', 'static'),
libraryTarget: 'amd'
},
node: {
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ deps=
numpy==1.14.3
ipywidgets==7.2.0
matplotlib==2.2.3
--editable=file:///{toxinidir}/../plotly-package
--editable=file:///{toxinidir}/../plotly


; Plot.ly environments
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,8 @@ def perform_codegen():
# ---------------------------------
# (relative to project root)
abs_file_path = opath.realpath(__file__)
project_root = opath.dirname(opath.dirname(opath.dirname(abs_file_path)))

outdir = opath.join(project_root, 'plotly-package', 'plotly')
packages_py = opath.dirname(opath.dirname(opath.dirname(abs_file_path)))
outdir = opath.join(packages_py, 'plotly', 'plotly')

# Delete prior codegen output
# ---------------------------
Expand All @@ -107,8 +106,8 @@ def perform_codegen():
# Load plotly schema
# ------------------
plot_schema_path = opath.join(
project_root,
'plotly-package',
packages_py,
'plotly',
'codegen',
'resources',
'plot-schema.json',
Expand Down
File renamed without changes.
Loading