Skip to content

Commit 831f56f

Browse files
Merge branch 'main' into release-plz-2025-01-10T20-50-29Z
2 parents 2017c04 + 5019645 commit 831f56f

File tree

3 files changed

+48
-12
lines changed

3 files changed

+48
-12
lines changed

.github/workflows/release-plz.yml

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ on:
88
push:
99
branches:
1010
- main
11-
# Temporarily add the `add-release-plz` branch to test the release-plz PR workflow
12-
- add-release-plz
1311

1412
jobs:
1513
release-plz-release:

.github/workflows/rust.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@ jobs:
1616

1717
steps:
1818
- uses: actions/checkout@v3
19-
- name: Cache Rust dependencies
20-
uses: Swatinem/rust-cache@v2
19+
# - name: Cache Rust dependencies
20+
# uses: Swatinem/rust-cache@v2
21+
- name: Install Rust
22+
uses: dtolnay/rust-toolchain@stable
23+
with:
24+
toolchain: stable
2125
- name: Build
2226
run: cargo build --verbose
2327
- name: Run tests

README.md

+42-8
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,54 @@ Library and associated command-line application for exploring and fetching [popg
77
- Install [Rust](https://www.rust-lang.org/tools/install)
88
- Install CLI:
99
```shell
10-
cargo install --git https://github.com/Urban-Analytics-Technology-Platform/popgetter-cli.git
10+
cargo install popgetter-cli
1111
```
1212
- Run the CLI with e.g.:
1313
```shell
1414
popgetter --help
1515
```
1616

17-
### Popgetter version compatibility
17+
## About the data
1818

19-
Each version of `popgetter-cli` is tied to one specific version of `popgetter` to ensure consistency of data _types_.
19+
The data used by `popgetter` is collated into a format ready for use, by a tool called [`poppusher`](https://github.com/Urban-Analytics-Technology-Platform/poppusher). See that tool for details about which data is available.
20+
21+
## Popgetter and Poppusher version compatibility
22+
23+
Each version of `popgetter-core` is tied to one specific version of `poppusher` to ensure consistency of data _types_. Changes to `popgetter-core` may require changes to downstream [dependents](https://crates.io/crates/popgetter-core/reverse_dependencies).
2024
(Note that updates to the actual data and metadata themselves do not lead to a version bump.)
2125

22-
| popgetter | popgetter-cli |
23-
| --------- | ------------- |
24-
| 0.1.0 | |
25-
| 0.2.0 | 0.2.0 |
26-
| ... | ... |
26+
| poppusher | popgetter-core | popgetter-cli | popgetter-py |
27+
| --------- | -------------- | ------------- | ------------ |
28+
| 0.1.0 | N/A | N/A | N/A |
29+
| 0.2.0 | 0.2.0 | 0.2.0 | 0.2.0 |
30+
| 0.2.0 | 0.2.1 | 0.2.1 | 0.2.1 |
31+
| ... | ... | | |
32+
33+
34+
## Developer guide
35+
36+
### Editable install from source
37+
38+
- Install [Rust](https://www.rust-lang.org/tools/install)
39+
- Clone the repo:
40+
```shell
41+
git clone git@github.com:Urban-Analytics-Technology-Platform/popgetter.git
42+
cd popgetter
43+
```
44+
- Build:
45+
```shell
46+
cargo build
47+
```
48+
and in release mode:
49+
```shell
50+
cargo build --release
51+
```
52+
- Run the CLI with e.g.:
53+
```shell
54+
cargo run --bin popgetter -- --help
55+
```
56+
57+
58+
### Release process
59+
60+
The release process in managed by the [`release-plz`](https://release-plz.dev/docs/github) GitHub Action ([workflow](.github/workflows/python.yml)).

0 commit comments

Comments
 (0)