Skip to content

Commit 3028023

Browse files
committed
Update workflows to publish to PyPI and adjust dependencies
1 parent ccbcc07 commit 3028023

5 files changed

Lines changed: 25 additions & 15 deletions

File tree

.github/workflows/deploy-dev-release.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Development Release
22

3-
# Manual trigger only - creates GitHub release with artifacts (no PyPI)
3+
# Manual trigger only - creates GitHub release with artifacts and publishes to PyPI
44
on:
55
workflow_dispatch:
66
inputs:
@@ -128,6 +128,13 @@ jobs:
128128
git push origin HEAD:${{ github.ref_name }}
129129
git push origin ${{ env.NEW_TAG }}
130130
131+
- name: Publish to PyPI
132+
if: github.repository_owner == 'GRIDAPPSD'
133+
env:
134+
TWINE_USERNAME: __token__
135+
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
136+
run: pixi run publish
137+
131138
- name: Create GitHub Release
132139
uses: ncipollo/release-action@v1.15.0
133140
with:
@@ -140,18 +147,18 @@ jobs:
140147
body: |
141148
## Development Release
142149
143-
This is a development/pre-release version. It is **not published to PyPI**.
150+
This is a development/pre-release version published to PyPI.
144151
145152
### Installation
146153
147-
**Via pip (from GitHub release):**
154+
**Via pip (from PyPI):**
148155
```bash
149-
pip install https://github.com/GRIDAPPSD/gridappsd-python/releases/download/${{ env.NEW_TAG }}/gridappsd_python-${{ env.NEW_VERSION }}-py3-none-any.whl
156+
pip install gridappsd-python==${{ env.NEW_VERSION }}
150157
```
151158
152-
**Via pip (from git tag):**
159+
**Via pip (from GitHub release):**
153160
```bash
154-
pip install git+https://github.com/GRIDAPPSD/gridappsd-python.git@${{ env.NEW_TAG }}#subdirectory=gridappsd-python-lib
161+
pip install https://github.com/GRIDAPPSD/gridappsd-python/releases/download/${{ env.NEW_TAG }}/gridappsd_python-${{ env.NEW_VERSION }}-py3-none-any.whl
155162
```
156163
157164
**Via Docker:**

.github/workflows/release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,13 @@ jobs:
9292
git push origin HEAD:${{ github.ref_name }}
9393
git push origin ${{ env.TAG }}
9494
95+
- name: Publish to PyPI
96+
if: github.repository_owner == 'GRIDAPPSD'
97+
env:
98+
TWINE_USERNAME: __token__
99+
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
100+
run: pixi run publish
101+
95102
- name: Create GitHub Release
96103
uses: ncipollo/release-action@v1.15.0
97104
with:
@@ -104,13 +111,6 @@ jobs:
104111
name: "Release ${{ env.VERSION }}"
105112
token: ${{ secrets.GITHUB_TOKEN }}
106113

107-
- name: Publish to PyPI
108-
if: github.repository_owner == 'GRIDAPPSD'
109-
env:
110-
TWINE_USERNAME: __token__
111-
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
112-
run: pixi run publish
113-
114114
# Docker build and push
115115
- name: Set up Docker Buildx
116116
uses: docker/setup-buildx-action@v3

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,5 +115,8 @@ ENV/
115115
# pixi
116116
.pixi/
117117

118+
# uv
119+
uv.lock
120+
118121
# ruff
119122
.ruff_cache/

gridappsd-field-bus-lib/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ packages = [
2525
[tool.poetry.dependencies]
2626
python = ">=3.10,<4.0"
2727
gridappsd-python = ">=2025.3.1a1"
28-
cim-graph = ">=0.2.2a4"
28+
cim-graph = ">=0.4.3a6"
2929
click = "^8.1.8"
3030

3131
[tool.poetry.scripts]

pixi.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ python-dotenv = ">=0.9"
2626
loguru = ">=0.7"
2727

2828
# Field bus dependencies
29-
cim-graph = ">=0.2.2a4"
29+
cim-graph = ">=0.4.3a6"
3030
click = ">=8.1"
3131

3232
# Install local packages in editable mode

0 commit comments

Comments
 (0)