Skip to content
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

Fix EWFC (B) appearing in public-ui #115

Merged
merged 2 commits into from
Jan 22, 2024
Merged

Fix EWFC (B) appearing in public-ui #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef2b561
Ensure parameter for EWFC B doesn't take priority over EWFC
dragon-dxw Jan 18, 2024
a8b9054
Make single letter subcourts valid
dragon-dxw Jan 18, 2024
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog 1.0.0].

## [Release 1.3.5]

- Fix an issue with EWFC B's name taking priority for the 'ewfc' param

## [Release 1.3.4]

- Add data for EWFC B
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "ds_caselaw_utils"
version = "1.3.4"
version = "1.3.5"
description = "Utilities for the National Archives Caselaw project"
authors = ["Nick Jackson <[email protected]>", "David McKee <[email protected]>", "Tim Cowlishaw <[email protected]>", "Laura Porter <[email protected]>"]
license = "MIT"
Expand Down
2 changes: 1 addition & 1 deletion src/ds_caselaw_utils/data/court_names.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@
# This is an artifact of how the Family Court creates tiers of importance.
link: https://www.judiciary.uk/you-and-the-judiciary/going-to-court/family-law-courts/
ncn: \[(\d{4})\] (EWFC) (B) (\d+)
param: "ewfc"
param: "ewfc/b"
start_year: 2009
end_year: 2022
selectable: false
Expand Down
6 changes: 3 additions & 3 deletions src/ds_caselaw_utils/data/schema/courts.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"properties": {
"code": {
"type": "string",
"pattern": "^[A-Za-z]{2,}(-[A-Za-z]{1,})*$"
"pattern": "^[A-Za-z]{2,}(-[A-Za-z]+)*$"
},
"name": {
"type": "string"
Expand All @@ -33,13 +33,13 @@
},
"param": {
"type": "string",
"pattern": "^[a-z]{2,}(/[a-z]{2,})?$"
"pattern": "^[a-z]{2,}(/[a-z]+)?$"
},
"extra_params": {
"type": "array",
"items": {
"type": "string",
"pattern": "^[a-z]{2,}(/[a-z]{2,})?$"
"pattern": "^[a-z]{2,}(/[a-z]+)?$"
}
},
"ncn": {
Expand Down