Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: Release

on:
push:
tags:
- "v*.*.*"
branches:
- main

jobs:
release:
Expand All @@ -17,14 +17,11 @@ jobs:
with:
python-version: "3.12"

- name: Verify tag matches package version
- name: Read package version
id: version
run: |
TAG_VERSION="${GITHUB_REF_NAME#v}"
PKG_VERSION="$(python3 -c 'import tomllib; print(tomllib.load(open("pyproject.toml", "rb"))["project"]["version"])')"
if [ "$TAG_VERSION" != "$PKG_VERSION" ]; then
echo "Tag $GITHUB_REF_NAME does not match pyproject.toml version $PKG_VERSION"
exit 1
fi
echo "version=$PKG_VERSION" >> "$GITHUB_OUTPUT"

- name: Install build tool
run: pip install build
Expand All @@ -35,5 +32,7 @@ jobs:
- name: Create GitHub release
uses: softprops/action-gh-release@v2
with:
tag_name: v${{ steps.version.outputs.version }}
name: v${{ steps.version.outputs.version }}
files: dist/*
generate_release_notes: true
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ pytest

1. Update `version` in `pyproject.toml` (e.g. `0.2.0`).
2. Commit and push to `main`.
3. Tag the commit and push the tag:
```bash
git tag v0.2.0
git push origin v0.2.0
```
4. The `Release` GitHub Actions workflow builds the package and publishes a
GitHub Release for the tag, with notes auto-generated from merged PRs since
the previous release (categorized via `.github/release.yml`).
3. The `Release` GitHub Actions workflow runs on every push to `main`: it reads
the version from `pyproject.toml`, builds the package, and publishes a
`v0.2.0` GitHub Release (creating the matching tag automatically), with
notes auto-generated from merged PRs since the previous release
(categorized via `.github/release.yml`).

Pushing to `main` without bumping the version re-publishes the release for
the current version with the latest build artifacts.

## Install in JupyterLab

Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ readme = "README.md"
requires-python = ">=3.10"
authors = [{ name = "EEA Data Hub" }]
dependencies = [
"pandas>=2.2,<3",
"pyarrow>=17,<22", # parquet writer + the Arrow types the ingest lane expects
#"pandas>=2.2,<3",
# "pyarrow>=17,<22", # parquet writer + the Arrow types the ingest lane expects
"openpyxl>=3.1,<4", # .xlsx reader — handles sparse cells correctly (see bathing_water/README.md)
"xlrd>=2.0,<3", # legacy .xls, some older SDI deliveries
"lxml>=5.2,<7", # ISO 19115-3 metadata records
Expand Down
10 changes: 5 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pandas>=2.2,<3
pyarrow>=17,<22 # parquet writer + the Arrow types the ingest lane expects
#pandas>=2.2,<3
#pyarrow>=17 # parquet writer + the Arrow types the ingest lane expects
openpyxl>=3.1,<4 # .xlsx reader — handles sparse cells correctly (see bathing_water/README.md)
xlrd>=2.0,<3 # legacy .xls, some older SDI deliveries
lxml>=5.2,<7 # ISO 19115-3 metadata records
Expand All @@ -15,9 +15,9 @@ pyproj>=3.6,<4 # only where a reprojection is a deliberate, documen

# --- acquire ---------------------------------------------------------------
requests>=2.32,<3
httpx>=0.28,<1 # also the dds_ingest dependency
beautifulsoup4>=4.12,<5 # SDI "direct download" is an HTML landing page, not a file
tqdm>=4.66,<5
#httpx>=0.28,<1 # also the dds_ingest dependency
#beautifulsoup4>=4.12,<5 # SDI "direct download" is an HTML landing page, not a file
#tqdm>=4.66,<5

# --- build backend for the mounted dds_ingest source -----------------------
# Present so the entrypoint can install /opt/dds_ingest offline, with
Expand Down
Loading