New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Harmonise `data` and `metrics` commands #57

Merged

sgreenbury merged 16 commits into main from harmonise-data-metrics

Jul 5, 2024

Member

penelopeysm commented Jul 2, 2024 •

edited

Loading

This PR:

Creates a single SearchParams struct, and a corresponding SearchParamsArgs struct which represents the command-line arguments used to generate a SearchParams
Modifies both the data and metrics commands to use these (data will search for appropriate metrics and then download them; metrics searches for appropriate metrics and then pretty-prints them)

(Merge #56 first before this one! :))

What's not done in this PR:

Rework recipe command to use the serialised version of the search params
Tests

penelopeysm added 7 commits

June 30, 2024 16:05


          Use constants for column names

904b5c0

See: https://github.com/Urban-Analytics-Technology-Platform/popgetter/issues/109


          Enforce nonempty search context for text

a7618b1

See #49


          Improve year range parsing; disallow multiple searches for the same t…

377b8ee

…hing


          Lint

e38b584


          Rework data command to use same SearchParams as metrics

04e2fc2

See #53


          Fix tests

c89cfc6


          Merge branch 'serialisation-aliases' into harmonise-data-metrics

penelopeysm changed the base branch from serialisation-aliases to main

July 2, 2024 10:02

penelopeysm added 2 commits

July 2, 2024 23:28


          filename -> filepath

2ac2c37


          Merge branch 'serialisation-aliases' into harmonise-data-metrics

sgreenbury reviewed

View reviewed changes

src/cli.rs Show resolved Hide resolved

sgreenbury reviewed

View reviewed changes

src/formatters.rs Show resolved Hide resolved

sgreenbury mentioned this pull request

Checklist for v0.2 release #58

Closed

4 tasks

sgreenbury reviewed

View reviewed changes

src/cli.rs Show resolved Hide resolved

sgreenbury reviewed

View reviewed changes

Cargo.toml Show resolved Hide resolved

sgreenbury reviewed

View reviewed changes

src/geo.rs Show resolved Hide resolved

sgreenbury reviewed

View reviewed changes

src/cli.rs Outdated Show resolved Hide resolved

sgreenbury reviewed

View reviewed changes

src/parquet.rs Show resolved Hide resolved

sgreenbury added 6 commits

July 4, 2024 17:04


          Make year range search param optional

5f3cb90


          Merge branch 'main' into harmonise-data-metrics

850a31e


          Make output_file optional and pass stdout instead of file when None

40e08fa


          Refactor bytes to string

8c8b9a1


          Revert "Refactor bytes to string"

9dc1a36

This reverts commit 8c8b9a1.


          Add search method to popgetter

20e6021

sgreenbury mentioned this pull request

Add tests for the search functionality #59

Open

2 tasks


          Add utils functions to combine queries, fix missing file create

ca2239d

Co-authored-by: Penelope Yong <[email protected]>

Contributor

sgreenbury commented Jul 5, 2024

Thanks very much @penelopeysm, this looks great! I think this is ready to merge following the discussion.

sgreenbury merged commit ac28eab into main

2 checks passed

sgreenbury deleted the harmonise-data-metrics branch

July 5, 2024 16:50

sgreenbury mentioned this pull request

Clean up search interface #49

Closed

This was referenced Jul 9, 2024

Refactor data to use search_results function #53

Closed

Reimplement recipe subcommand #67

Closed

sgreenbury mentioned this pull request

Scoping: next steps for search and download APIs #88

Open

33 tasks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet