Skip to content

Commit 6db4ab5

Browse files
committed
Release 0.1.8
2 parents 8c435ef + 5acf885 commit 6db4ab5

File tree

11 files changed

+87
-53
lines changed

11 files changed

+87
-53
lines changed

.github/workflows/docs.yml

Lines changed: 11 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,18 @@
1-
# Based on https://github.com/actions/starter-workflows/blob/main/pages/static.yml
2-
name: Publish docs
1+
name: Build Docs
32

43
on:
4+
workflow_dispatch: {}
55
push:
6-
branches: [main]
7-
8-
# Needed for publishing to Github Pages
9-
permissions:
10-
contents: read
11-
pages: write
12-
id-token: write
13-
14-
concurrency:
15-
group: "pages"
16-
cancel-in-progress: true
6+
branches: [main, develop]
7+
pull_request:
8+
types: [opened, synchronize, edited]
9+
branches: [main, develop]
1710

1811
jobs:
19-
publish:
20-
environment:
21-
name: github-pages
22-
url: ${{ steps.deployment.outputs.page_url }}
12+
docs:
13+
name: Build Docs
2314
runs-on: ubuntu-latest
2415
steps:
25-
- uses: actions/checkout@v3
26-
- name: BEE Install
27-
run: |
28-
sudo apt-get update
29-
sudo apt-get install python3 python3-venv curl build-essential \
30-
zlib1g-dev libncurses5-dev libgdbm-dev libnss3-dev libssl-dev libsqlite3-dev \
31-
libreadline-dev libffi-dev libbz2-dev libyaml-dev
32-
curl -sSL https://install.python-poetry.org | python3 -
33-
poetry update
34-
poetry install
35-
- name: Build Docs
36-
run: |
37-
poetry run make -C docs/sphinx html
38-
- name: Upload
39-
uses: actions/upload-pages-artifact@v1
40-
with:
41-
path: docs/sphinx/_build/html
42-
- name: Publish
43-
id: deployment
44-
uses: actions/deploy-pages@v1
16+
- uses: actions/checkout@v4
17+
- name: Install BEE and Build Docs
18+
run: ./ci/docs.sh

.github/workflows/integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
# available on 20.04
2626
runs-on: ubuntu-22.04
2727
steps:
28-
- uses: actions/checkout@v3
28+
- uses: actions/checkout@v4
2929
- name: Install and Configure
3030
run: |
3131
. ./ci/env.sh

.github/workflows/publish-docs.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Based on https://github.com/actions/starter-workflows/blob/main/pages/static.yml
2+
name: Publish docs
3+
4+
on:
5+
push:
6+
branches: [main]
7+
8+
# Needed for publishing to Github Pages
9+
permissions:
10+
contents: read
11+
pages: write
12+
id-token: write
13+
14+
concurrency:
15+
group: "pages"
16+
cancel-in-progress: true
17+
18+
jobs:
19+
publish:
20+
environment:
21+
name: github-pages
22+
url: ${{ steps.deployment.outputs.page_url }}
23+
runs-on: ubuntu-latest
24+
steps:
25+
- uses: actions/checkout@v3
26+
- name: BEE Install and Build Docs
27+
run: |
28+
./ci/docs.sh
29+
- name: Upload
30+
uses: actions/upload-pages-artifact@v1
31+
with:
32+
path: docs/sphinx/_build/html
33+
- name: Publish
34+
id: deployment
35+
uses: actions/deploy-pages@v1

.github/workflows/pylama.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: PyLama Lint
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- name: Lint
2020
run: |
2121
pip install pylama==8.4.1 pyflakes==3.0.1 pylint==2.15.9 pydocstyle==6.1.1 2>&1 >/dev/null

.github/workflows/unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
# available on 20.04
2424
runs-on: ubuntu-22.04
2525
steps:
26-
- uses: actions/checkout@v3
26+
- uses: actions/checkout@v4
2727
- name: Install and Configure
2828
run: |
2929
. ./ci/env.sh

HISTORY.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,14 @@ Major features: adds the capability to include post- and pre-processing scripts
5555
- Fix Checkpoint/Restart capability
5656
- Add testing for Checkpoint/Restart
5757
- Adds capability to reset the beeflow files (deletes all artifacts) especially useful for developers.
58+
59+
0.1.8
60+
61+
Features: Fixes sphinx version to enable publishing documentation, now includes
62+
CI for testing documentation builds
63+
64+
- Update sphinx version, update actions and release docs (#812)
65+
- Add separate action for testing docs
66+
- Fix beeflow config new error
67+
68+

RELEASE.rst

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,14 @@ Verify all current changes in develop run correctly on nightly tests.
1818
5. Once merged, on github web interface create a release and tag based on main branch
1919
that matches the version in pyproject.toml
2020
6. Follow step 2 but uncheck Allow specified actors to bypass and don't forget save
21-
7. Finally, on the main branch, first run a ``poetry build`` and then a
22-
``poetry publish``. The second command will ask for a username and password (You may need to add the --username --password options to ``poetry build``)
23-
for PyPI.
21+
7. Log into your PYPI account and get a token for hpc-beeflow.
22+
8. Finally, on the command line: checkout the main branch and make sure you pull the latest verison
23+
24+
Then publish by:
25+
``poetry build``
26+
27+
``poetry publish -u __token__ -p pypi-<long-token>``
28+
2429

2530
Check the documentation at: `https://lanl.github.io/BEE/ <https://lanl.github.io/BEE/>`_
2631
Also upgrade the pip version in your python or anaconda environment and check the version:

beeflow/client/core.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
from beeflow.common.db.bdb import connect_db
3131
from beeflow.wf_manager.common import dep_manager
3232

33-
db_path = wf_utils.get_db_path()
34-
3533

3634
class ComponentManager:
3735
"""Component manager class."""
@@ -467,6 +465,7 @@ def stop(query='yes'):
467465

468466
def kill_active_workflows(active_states, workflow_list):
469467
"""Kill workflows with active states."""
468+
db_path = wf_utils.get_db_path()
470469
db = connect_db(wfm_db, db_path)
471470
success = True
472471
for name, wf_id, state in workflow_list:

beeflow/enhanced_client/package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci/docs.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/sh
2+
# Install BEE and build the docs in CI.
3+
sudo apt-get update
4+
sudo apt-get install python3 python3-venv curl build-essential \
5+
zlib1g-dev libncurses5-dev libgdbm-dev libnss3-dev libssl-dev libsqlite3-dev \
6+
libreadline-dev libffi-dev libbz2-dev libyaml-dev
7+
curl -sSL https://install.python-poetry.org | python3 -
8+
poetry update
9+
poetry install
10+
poetry run make -C docs/sphinx html

0 commit comments

Comments
 (0)