Skip to content

Commit 7db5046

Browse files
authored
Merge pull request #191 from firedrakeproject/connorjward/merge-release
DO NOT SQUASH Merge release
2 parents 5040a44 + caee945 commit 7db5046

3 files changed

Lines changed: 64 additions & 12 deletions

File tree

.github/workflows/release.yml

Lines changed: 60 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,69 @@
1-
name: Publish release on PyPI
1+
name: Publish release
22

33
on:
4-
release:
5-
types: [published]
4+
workflow_dispatch:
5+
inputs:
6+
branch:
7+
description: The branch to release from
8+
type: string
9+
required: true
10+
version:
11+
description: The version number to release
12+
type: string
13+
required: true
614

715
jobs:
8-
pypi_publish:
16+
check:
17+
name: Pre-release checks
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: actions/checkout@v5
21+
with:
22+
ref: ${{ inputs.branch }}
23+
24+
- uses: actions/setup-python@v5
25+
with:
26+
python-version: '3.12'
27+
28+
- name: Check no 'TODO RELEASE' comments remain
29+
run: |
30+
if [ -z "$( grep -r --exclude-dir='.*' 'TODO RELEASE' )" ]; then
31+
exit 0
32+
else
33+
exit 1
34+
fi
35+
36+
- name: Check version number matches
37+
run: |
38+
if [ -z "$( grep 'version = \"${{ inputs.version }}\"' pyproject.toml )" ]; then
39+
exit 1
40+
else
41+
exit 0
42+
fi
43+
44+
- name: Check tests pass
45+
run: |
46+
pip install '.[test]'
47+
DATA_REPO_GIT="" pytest test/
48+
49+
pypi:
950
name: Publish release on PyPI
51+
needs: check
1052
uses: ./.github/workflows/pypi.yml
1153
with:
12-
ref: ${{ github.ref }}
54+
ref: ${{ inputs.branch }}
1355
pypi: true
1456
secrets: inherit
57+
58+
github_release:
59+
name: Create GitHub release
60+
needs: pypi
61+
runs-on: ubuntu-latest
62+
permissions:
63+
contents: write
64+
steps:
65+
- uses: actions/checkout@v5
66+
- name: Create release
67+
env:
68+
GH_TOKEN: ${{ github.token }}
69+
run: gh release create --title ${{ inputs.version }} --target ${{ inputs.branch }} --generate-notes ${{ inputs.version }}

.github/workflows/test.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,3 @@ jobs:
4040
run: DATA_REPO_GIT="" python -m pytest --cov=FIAT/ test/FIAT
4141
- name: Test FInAT
4242
run: DATA_REPO_GIT="" python -m pytest --cov=finat/ --cov=gem/ test/finat
43-
- name: Coveralls
44-
if: ${{ github.repository == 'FEniCS/fiat' && github.head_ref == '' && matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11' }}
45-
env:
46-
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
47-
run: coveralls

pyproject.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "firedrake-fiat"
7-
version = "2025.7.0.dev0"
7+
# TODO RELEASE
8+
version = "2025.11.0.dev0"
89
dependencies = [
9-
"fenics-ufl @ git+https://github.com/FEniCS/ufl.git",
10+
# TODO RELEASE
11+
"fenics-ufl @ git+https://github.com/FEniCS/ufl.git@main",
1012
"numpy>=1.16",
1113
"recursivenodes",
1214
"scipy",

0 commit comments

Comments
 (0)