Skip to content

Commit e7444cd

Browse files
committed
Add munge_url from libhxl as follow_url and remove libhxl dependency
Upgrade to uv
1 parent 3064f98 commit e7444cd

4 files changed

Lines changed: 23 additions & 6 deletions

File tree

CONTRIBUTING.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,24 @@ Development is currently done using Python 3.13. The environment can be created
1010

1111
This creates a .venv folder with the versions specified in the project's uv.lock file.
1212

13+
### Pre-commit
14+
15+
pre-commit will be installed when syncing uv. It is run every time you make a git
16+
commit if you call it like this:
17+
18+
```shell
19+
pre-commit install
20+
```
21+
22+
With pre-commit, all code is formatted according to
23+
[ruff](https://docs.astral.sh/ruff/) guidelines.
24+
25+
To check if your changes pass pre-commit without committing, run:
26+
27+
```shell
28+
pre-commit run --all-files
29+
```
30+
1331
## Packages
1432

1533
[uv](https://github.com/astral-sh/uv) is used for package management. If

src/hdx/api/utilities/url_utils.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ def _get_ckan_urls(dataset_id: str, resource_id: str) -> list[str]:
128128
if resource:
129129
result_urls.append(resource["url"])
130130
else:
131-
# CKAN dataset (package) URL
132131
dataset = hdx.data.dataset.Dataset.read_from_hdx(dataset_id)
133132
for resource in dataset.get_resources():
134133
if url := resource.get("url"):

src/hdx/data/dataset.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
from hdx.utilities.uuid import is_valid_uuid
3333
from requests import Session
3434

35-
import hdx.api.utilities.url_utils as url_utils
35+
import hdx.api.utilities.url_utils
3636
import hdx.data.organization as org_module
3737
import hdx.data.resource as res_module
3838
import hdx.data.showcase as sc_module
@@ -215,9 +215,9 @@ def save_to_json(
215215
"""
216216
dataset_dict = self.get_dataset_dict()
217217
if follow_urls:
218-
session = url_utils.get_ckan_ready_session(self.configuration)
218+
session = hdx.api.utilities.url_utils.get_ckan_ready_session(self.configuration)
219219
for resource in dataset_dict.get("resources", tuple()):
220-
resource["url"] = url_utils.follow_url(resource["url"], session=session)
220+
resource["url"] = hdx.api.utilities.url_utils.follow_url(resource["url"], session=session)
221221
save_json(dataset_dict, path)
222222

223223
@staticmethod

src/hdx/data/resource.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from hdx.utilities.retriever import Retrieve
1414
from hdx.utilities.uuid import is_valid_uuid
1515

16-
import hdx.api.utilities.url_utils as url_utils
16+
import hdx.api.utilities.url_utils
1717
import hdx.data.dataset
1818
import hdx.data.resource_matcher
1919
from hdx.api.configuration import Configuration
@@ -669,7 +669,7 @@ def download(
669669
file_format = f".{self.get_format()}"
670670
if not filename.endswith(file_format):
671671
filename = f"{filename}{file_format}"
672-
session = url_utils.get_ckan_ready_session(self.configuration)
672+
session = hdx.api.utilities.url_utils.get_ckan_ready_session(self.configuration)
673673
with Download(session=session) as downloader:
674674
if retriever:
675675
downloader = retriever.clone(downloader)

0 commit comments

Comments
 (0)