Skip to content

Commit 4363c51

Browse files
Merge pull request #3941 from plotly/single_artifact
make a single artifact tarball
2 parents cbe41e6 + cebe516 commit 4363c51

File tree

2 files changed

+16
-26
lines changed

2 files changed

+16
-26
lines changed

.circleci/config.yml

+10-16
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ jobs:
266266
conda create -n env --yes python=3.9 conda-build conda-verify
267267
conda install -n env -c conda-forge jupyterlab nodejs=12
268268
conda init bash
269+
mkdir output
269270
270271
- run:
271272
name: initial NPM Build
@@ -284,12 +285,7 @@ jobs:
284285
conda activate env
285286
cd packages/python/plotly
286287
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
293289
294290
- run:
295291
name: Conda Build
@@ -298,12 +294,7 @@ jobs:
298294
conda activate env
299295
cd packages/python/plotly
300296
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
307298
308299
- run:
309300
name: NPM Pack
@@ -312,12 +303,15 @@ jobs:
312303
conda activate env
313304
cd packages/javascript/jupyterlab-plotly
314305
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
317312
318313
- store_artifacts:
319-
path: packages/javascript/jupyterlab-plotly/npm_dist
320-
destination: npm_dist
314+
path: output.tgz
321315

322316
build-doc:
323317
resource_class: xlarge

release.md

+6-10
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,7 @@ Manually update the versions to `X.Y.Z` in the files specified below.
5959

6060
### Download and QA CI Artifacts
6161

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.
6763

6864
**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.)
6965

@@ -72,13 +68,13 @@ To locally install the PyPI dist, make sure you have an environment with Jupyter
7268
- `tar xzf all.tgz`
7369
- `pip uninstall plotly`
7470
- `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`
7672

7773
To locally install the Conda dist (generally do this in a different, clean environment from the one above!):
7874

7975
- `conda uninstall plotly`
8076
- `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`
8278

8379
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:.
8480

@@ -94,21 +90,21 @@ you can publish the artifacts. **You will need special credentials from Plotly l
9490

9591
Publishing to PyPI:
9692
```bash
97-
(plotly_dev) $ cd pypi_dist/dist
93+
(plotly_dev) $ cd path/to/output/dist
9894
(plotly_dev) $ twine upload plotly-X.Y.Z*
9995
```
10096

10197
Publishing to NPM:
10298

10399
```bash
104-
(plotly_dev) $ cd npm_dist
100+
(plotly_dev) $ cd path/to/output
105101
(plotly_dev) $ npm publish jupyterlab-plotly-X.Y.Z.tgz
106102
```
107103

108104
Publishing to `plotly` conda channel (make sure you have run `conda install anaconda-client` to get the `anaconda` command):
109105

110106
```
111-
(plotly_dev) $ cd conda_dist
107+
(plotly_dev) $ cd path/to/output
112108
(plotly_dev) $ anaconda upload plotly-X.Y.Z.tar.bz2
113109
```
114110

0 commit comments

Comments
 (0)