Skip to content

Commit e5cd614

Browse files
committed
WIP: trying to fix pyproject toml locked files step 2
1 parent fc4fc33 commit e5cd614

File tree

6 files changed

+1789
-1781
lines changed

6 files changed

+1789
-1781
lines changed

.github/workflows/bump.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ jobs:
5151
5252
# Bump
5353
uv version --no-sync --bump ${{ github.event.inputs.bump_rule }}
54+
# Create a copy of pyproject.toml which we can use for restoring
55+
cp pyproject.toml pyproject-dev.toml
5456
5557
NEW_VERSION=`sed -ne 's/^version = "\([0-9\.]*\)"/\1/p' pyproject.toml`
5658
echo "Bumping to version $NEW_VERSION"
@@ -76,6 +78,8 @@ jobs:
7678
# version as the tagged commit)
7779
BASE_VERSION=`sed -ne 's/^version = "\([0-9\.]*\)"/\1/p' pyproject.toml`
7880
81+
# Put pyproject.toml back
82+
mv pyproject-dev.toml pyproject.toml
7983
# Bump to pre-release of next version
8084
uv version --no-sync --bump post
8185

.github/workflows/release.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ jobs:
3131
echo "PROJECT_VERSION=$PROJECT_VERSION" >> $GITHUB_ENV
3232
- name: Build package for PyPI
3333
run: |
34-
uv run --no-sync python scripts/add-locked-targets-to-pyproject-toml.py
3534
uv build
3635
# Just in case, undo the changes to `pyproject.toml`
3736
git restore --staged . && git restore .

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Dev copy of pyproject.toml used in CI
2+
pyproject-dev.toml
3+
14
# Local install dir
25
install-example
36

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ project(
33
['c', 'fortran'], # C as f2py creates C files so we need a C compiler
44
# Dev version (i.e. anything that isn't a release) will be 0.0.0
55
# because meson doesn't support pre-release identifiers like `.a`, `.post`
6-
version: '0.1.7', # injected with scripts/make-version-consistent.py, don't edit by hand
6+
version: '0.0.0', # injected with scripts/make-version-consistent.py, don't edit by hand
77
license: 'BSD-3-Clause',
88
meson_version: '>=1.3.0',
99
default_options: [

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "example-fgen-basic"
3-
version = "0.1.7"
3+
version = "0.1.7.post1"
44
description = "Basic example of using fgen"
55
authors = [
66
{ name = "Zebedee Nicholls", email = "zebedee.nicholls@climate-energy-college.org" },

0 commit comments

Comments
 (0)