Skip to content

Commit b6dd814

Browse files
committed
Added updateplotlyjsdev command to
pull plotly.js from master Perform automated dev build on circleci
1 parent ce2e1b5 commit b6dd814

10 files changed

+2683
-115
lines changed

Diff for: .circleci/config.yml

+130-75
Original file line numberDiff line numberDiff line change
@@ -383,82 +383,137 @@ jobs:
383383
- store_artifacts:
384384
path: artifacts
385385

386+
plotlyjs_dev_build:
387+
docker:
388+
- image: circleci/python:3.7-stretch-node-browsers
389+
environment:
390+
PLOTLY_TOX_PYTHON_37: python3.7
391+
LC_ALL: en_US.UTF-8
392+
LANG: en_US.UTF-8
393+
394+
steps:
395+
- checkout
396+
- run:
397+
name: Install tox
398+
command: 'sudo pip install tox requests yapf pytz decorator retrying'
399+
- run:
400+
name: Update plotlywidget version
401+
command: 'python setup.py updateplotlywidgetversion'
402+
- run:
403+
name: Update plotly.js to dev
404+
command: 'python setup.py updateplotlyjsdev'
405+
- run:
406+
name: Test with tox
407+
command: 'tox -e py37-core'
408+
no_output_timeout: 20m
409+
- run:
410+
name: Commit
411+
command: |
412+
sudo mkdir /dist
413+
git config --global user.email "[email protected]"
414+
git config --global user.name "Your Name"
415+
git add -A
416+
git commit -m "Codegen"
417+
git format-patch -n HEAD^
418+
sudo cp *.patch /dist
419+
when: always
420+
- run:
421+
name: Build source distribution package
422+
command: |
423+
python setup.py sdist
424+
sudo cp dist/* /dist
425+
when: always
426+
- run:
427+
name: npm-pack widget
428+
command: |
429+
cd js/
430+
npm install webpack
431+
npm pack
432+
sudo cp ./plotlywidget* /dist
433+
when: always
434+
- store_artifacts:
435+
path: /dist
436+
386437

387438
workflows:
388439
version: 2
389-
build:
440+
nightly:
390441
jobs:
391-
392-
- python-2.7-core
393-
- python-3.4-core
394-
- python-3.5-core
395-
- python-3.6-core
396-
- python-3.7-core
397-
- python-2.7-optional
398-
- python-3.4-optional
399-
- python-3.5-optional
400-
- python-3.6-optional
401-
# 3.7 optional disabled due to current shapely incompatibility
402-
# - python-3.7-optional
403-
- python-2.7-plot_ly
404-
- python-3.4-plot_ly
405-
- python-3.7-plot_ly
406-
- python-2-7-orca
407-
- python-3-5-orca
408-
- python-3-7-orca
409-
410-
- python-2-7-conda:
411-
requires:
412-
- python-2.7-core
413-
- python-2.7-optional
414-
- python-2.7-plot_ly
415-
- python-2-7-orca
416-
417-
filters:
418-
branches:
419-
only:
420-
- master
421-
- /release_.*/
422-
- /conda_build_.*/
423-
424-
- python-3-5-conda:
425-
requires:
426-
- python-3.5-core
427-
- python-3.5-optional
428-
# - python-3.5-plot_ly
429-
- python-3-5-orca
430-
431-
filters:
432-
branches:
433-
only:
434-
- master
435-
- /release_.*/
436-
- /conda_build_.*/
437-
438-
- python-3-6-conda:
439-
requires:
440-
- python-3.6-core
441-
- python-3.6-optional
442-
# - python-3.6-plot_ly
443-
# - python-3-6-orca
444-
445-
filters:
446-
branches:
447-
only:
448-
- master
449-
- /release_.*/
450-
- /conda_build_.*/
451-
452-
- python-3-7-conda:
453-
requires:
454-
- python-3.7-core
455-
# - python-3.7-optional
456-
- python-3.7-plot_ly
457-
- python-3-7-orca
458-
459-
filters:
460-
branches:
461-
only:
462-
- master
463-
- /release_.*/
464-
- /conda_build_.*/
442+
- plotlyjs_dev_build
443+
444+
# build:
445+
# jobs:
446+
#
447+
# - python-2.7-core
448+
# - python-3.4-core
449+
# - python-3.5-core
450+
# - python-3.6-core
451+
# - python-3.7-core
452+
# - python-2.7-optional
453+
# - python-3.4-optional
454+
# - python-3.5-optional
455+
# - python-3.6-optional
456+
# # 3.7 optional disabled due to current shapely incompatibility
457+
# # - python-3.7-optional
458+
# - python-2.7-plot_ly
459+
# - python-3.4-plot_ly
460+
# - python-3.7-plot_ly
461+
# - python-2-7-orca
462+
# - python-3-5-orca
463+
# - python-3-7-orca
464+
#
465+
# - python-2-7-conda:
466+
# requires:
467+
# - python-2.7-core
468+
# - python-2.7-optional
469+
# - python-2.7-plot_ly
470+
# - python-2-7-orca
471+
#
472+
# filters:
473+
# branches:
474+
# only:
475+
# - master
476+
# - /release_.*/
477+
# - /conda_build_.*/
478+
#
479+
# - python-3-5-conda:
480+
# requires:
481+
# - python-3.5-core
482+
# - python-3.5-optional
483+
## - python-3.5-plot_ly
484+
# - python-3-5-orca
485+
#
486+
# filters:
487+
# branches:
488+
# only:
489+
# - master
490+
# - /release_.*/
491+
# - /conda_build_.*/
492+
#
493+
# - python-3-6-conda:
494+
# requires:
495+
# - python-3.6-core
496+
# - python-3.6-optional
497+
## - python-3.6-plot_ly
498+
## - python-3-6-orca
499+
#
500+
# filters:
501+
# branches:
502+
# only:
503+
# - master
504+
# - /release_.*/
505+
# - /conda_build_.*/
506+
#
507+
# - python-3-7-conda:
508+
# requires:
509+
# - python-3.7-core
510+
## - python-3.7-optional
511+
# - python-3.7-plot_ly
512+
# - python-3-7-orca
513+
#
514+
# filters:
515+
# branches:
516+
# only:
517+
# - master
518+
# - /release_.*/
519+
# - /conda_build_.*/

Diff for: .gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
plotly/_version.py export-subst

Diff for: MANIFEST.in

+2
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ include LICENSE.txt
22
include README.rst
33
include README.md
44
include plotlywidget.json
5+
include versioneer.py
6+
include plotly/_version.py

Diff for: plotly/__init__.py

+4
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,7 @@
3131
from plotly import (plotly, dashboard_objs, graph_objs, grid_objs, tools,
3232
utils, session, offline, colors, io)
3333
from plotly.version import __version__
34+
35+
from ._version import get_versions
36+
__version__ = get_versions()['version']
37+
del get_versions

0 commit comments

Comments
 (0)