Commit 4363c51

authored

Merge pull request #3941 from plotly/single_artifact

make a single artifact tarball

2 parents cbe41e6 + cebe516 commit 4363c51Copy full SHA for 4363c51

File tree

2 files changed

+16

-26

lines changed

.circleci
- config.yml
release.md

2 files changed

+16

-26

lines changed

`‎.circleci/config.yml‎`

Lines changed: 10 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -266,6 +266,7 @@ jobs:`
`266`	`266`	`conda create -n env --yes python=3.9 conda-build conda-verify`
`267`	`267`	`conda install -n env -c conda-forge jupyterlab nodejs=12`
`268`	`268`	`conda init bash`
	`269`	`+ mkdir output`
`269`	`270`
`270`	`271`	`- run:`
`271`	`272`	`name: initial NPM Build`
`@@ -284,12 +285,7 @@ jobs:`
`284`	`285`	`conda activate env`
`285`	`286`	`cd packages/python/plotly`
`286`	`287`	`python setup.py sdist bdist_wheel`
`287`		`- mkdir pypi_dist`
`288`		`- tar czf pypi_dist/all.tgz dist`
`289`		`-`
`290`		`- - store_artifacts:`
`291`		`- path: packages/python/plotly/pypi_dist`
`292`		`- destination: pypi_dist`
	`288`	`+ cp -R dist ../../../output/dist`
`293`	`289`
`294`	`290`	`- run:`
`295`	`291`	`name: Conda Build`
`@@ -298,12 +294,7 @@ jobs:`
`298`	`294`	`conda activate env`
`299`	`295`	`cd packages/python/plotly`
`300`	`296`	`conda build recipe/`
`301`		`- mkdir conda_dist`
`302`		`- mv /opt/conda/envs/env/conda-bld/noarch/plotly*.tar.bz2 conda_dist`
`303`		`-`
`304`		`- - store_artifacts:`
`305`		`- path: packages/python/plotly/conda_dist`
`306`		`- destination: conda_dist`
	`297`	`+ mv /opt/conda/envs/env/conda-bld/noarch/plotly*.tar.bz2 ../../../output`
`307`	`298`
`308`	`299`	`- run:`
`309`	`300`	`name: NPM Pack`
`@@ -312,12 +303,15 @@ jobs:`
`312`	`303`	`conda activate env`
`313`	`304`	`cd packages/javascript/jupyterlab-plotly`
`314`	`305`	`npm pack`
`315`		`- mkdir npm_dist`
`316`		`- mv jupyterlab-plotly*.tgz npm_dist`
	`306`	`+ mv jupyterlab-plotly*.tgz ../../../output`
	`307`	`+`
	`308`	`+ - run:`
	`309`	`+ name: Zip output`
	`310`	`+ command: \|`
	`311`	`+ tar czf output.tgz output`
`317`	`312`
`318`	`313`	`- store_artifacts:`
`319`		`- path: packages/javascript/jupyterlab-plotly/npm_dist`
`320`		`- destination: npm_dist`
	`314`	`+ path: output.tgz`
`321`	`315`
`322`	`316`	`build-doc:`
`323`	`317`	`resource_class: xlarge`

`‎release.md‎`

Lines changed: 6 additions & 10 deletions

Original file line number	Diff line number	Diff line change
@@ -59,11 +59,7 @@ Manually update the versions to `X.Y.Z` in the files specified below.
`59`	`59`
`60`	`60`	`### Download and QA CI Artifacts`
`61`	`61`
`62`		-The `full_build` job in the `release_build` workflow in CircleCI produces three sets of artifacts. Download all three:
`63`		`-`
`64`		-1. `pypi_dist/all.tgz`
`65`		-2. `conda_dist/plotly-X.Y.Z.tar.bz2`
`66`		-3. `npm_dist/jupyterlab-plotly-X.Y.Z.tgz`
	`62`	+The `full_build` job in the `release_build` workflow in CircleCI produces a tarball of artifacts `output.tgz` which you should download and decompress, which will give you a directory called `output`. The filenames contained within will contain version numbers.
`67`	`63`
`68`	`64`	Note: if any of the version numbers are not simply `X.Y.Z` but include some kind of git hash, then this is a dirty build and you'll need to clean up whatever is dirtying the tree and follow the instructions above to trigger the build again. (That said, you can do QA on dirty builds, you just can't publish them.)
`69`	`65`
`@@ -72,13 +68,13 @@ To locally install the PyPI dist, make sure you have an environment with Jupyter`
`72`	`68`	- `tar xzf all.tgz`
`73`	`69`	- `pip uninstall plotly`
`74`	`70`	- `conda uninstall plotly` (just in case!)
`75`		-- `pip install dist/plotly-X.Y.X-py2.py3-none-any.whl`
	`71`	+- `pip install path/to/output/dist/plotly-X.Y.X-py2.py3-none-any.whl`
`76`	`72`
`77`	`73`	`To locally install the Conda dist (generally do this in a different, clean environment from the one above!):`
`78`	`74`
`79`	`75`	- `conda uninstall plotly`
`80`	`76`	- `pip uninstall plotly` (just in case!)
`81`		-- `conda install conda_dist/plotly-X.Y.Z.tar.bz2`
	`77`	+- `conda install path/to/output/plotly-X.Y.Z.tar.bz2`
`82`	`78`
`83`	`79`	`It's more complicated to locally install the NPM bundle, as you'll need to have a JupyterLab 2 environment installed... Undocumented for now :see_no_evil:.`
`84`	`80`
`@@ -94,21 +90,21 @@ you can publish the artifacts. **You will need special credentials from Plotly l`
`94`	`90`
`95`	`91`	`Publishing to PyPI:`
`96`	`92`	```bash
`97`		`-(plotly_dev) $ cd pypi_dist/dist`
	`93`	`+(plotly_dev) $ cd path/to/output/dist`
`98`	`94`	`(plotly_dev) $ twine upload plotly-X.Y.Z*`
`99`	`95`	```
`100`	`96`
`101`	`97`	`Publishing to NPM:`
`102`	`98`
`103`	`99`	```bash
`104`		`-(plotly_dev) $ cd npm_dist`
	`100`	`+(plotly_dev) $ cd path/to/output`
`105`	`101`	`(plotly_dev) $ npm publish jupyterlab-plotly-X.Y.Z.tgz`
`106`	`102`	```
`107`	`103`
`108`	`104`	Publishing to `plotly` conda channel (make sure you have run `conda install anaconda-client` to get the `anaconda` command):
`109`	`105`
`110`	`106`	```
`111`		`-(plotly_dev) $ cd conda_dist`
	`107`	`+(plotly_dev) $ cd path/to/output`
`112`	`108`	`(plotly_dev) $ anaconda upload plotly-X.Y.Z.tar.bz2`
`113`	`109`	```
`114`	`110`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 4363c51

File tree

2 files changed

2 files changed

`‎.circleci/config.yml‎`

`‎release.md‎`

0 commit comments