Skip to content

Commit b6079e4

Browse files
committed
Merge branch 'master' of https://github.com/VirtualPlanetaryLaboratory/vplot into readme
2 parents 1b573d4 + d2297c8 commit b6079e4

4 files changed

Lines changed: 6 additions & 8 deletions

File tree

.github/workflows/docs.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,10 @@ jobs:
2222
activate-environment: vplot
2323
environment-file: environment.yml
2424

25-
# TODO: Remove this step in production
2625
- name: Install vplanet-private pre-release
2726
shell: bash -l {0}
28-
env:
29-
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
3027
run: |
31-
python -m pip install --no-deps git+https://$ACCESS_TOKEN@github.com/VirtualPlanetaryLaboratory/vplanet-private.git@b1594c1c8b714803248762ab7a4ea5a034c25c39#egg=vplanet
28+
python -m pip install vplanet
3229
3330
- name: Run vplanet
3431
shell: bash -l {0}
@@ -65,4 +62,4 @@ jobs:
6562
if: steps.build.outcome == 'success' && github.event_name == 'push'
6663
with:
6764
branch: gh-pages
68-
folder: docs/_build/html
65+
folder: docs/_build/html

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
env:
2626
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
2727
run: |
28-
python -m pip install --no-deps git+https://$ACCESS_TOKEN@github.com/VirtualPlanetaryLaboratory/vplanet.git@b1594c1c8b714803248762ab7a4ea5a034c25c39#egg=vplanet
28+
python -m pip install --no-deps vplanet
2929
3030
- name: Install vplot
3131
shell: bash -l {0}

environment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies:
2222
- pytest-dependency>=0.5.1
2323
- pytest-env>=0.6.2
2424
- pytest-cov>=2.11.1
25-
- sphinx>=4.0.1
25+
- sphinx==4.2.0
2626
- jupyter_client
2727
- nbconvert>=5.5
28-
- nbsphinx
28+
- nbsphinx

vplot/figure.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@ def _add_labels(self):
311311
or line.get_label() == ""
312312
or line.get_label().startswith("_line")
313313
or line.get_label().startswith("_collection")
314+
or line.get_label().startswith("_child")
314315
):
315316

316317
label = ""

0 commit comments

Comments
 (0)