Skip to content

Commit

Permalink
Merge pull request #54 from OCHA-DAP/HAPI-234/dataset-provider-info
Browse files Browse the repository at this point in the history
HAPI-234 dataset provider info
  • Loading branch information
turnerm authored Oct 25, 2023
2 parents 7830028 + b92130b commit d004061
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 19 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [0.5.4] - 2023-10-19

### Changed

- HDX provider code and name change

## [0.5.3] - 2023-10-19

### Fixed
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ classifiers = [
requires-python = ">=3.8"

dependencies = [
"hdx-python-scraper>= 2.2.1",
"hdx-python-scraper>= 2.2.2",
"hdx-python-country>= 3.5.5",
"hdx-python-database[postgresql]>= 1.2.9",
"hapi-schema>= 0.2.0",
"hapi-schema>= 0.3.2",
"libhxl",
"sqlalchemy"
]
Expand Down
30 changes: 15 additions & 15 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ attrs==23.1.0
# frictionless
# jsonlines
# jsonschema
cachetools==5.3.1
cachetools==5.3.2
# via google-auth
certifi==2023.7.22
# via requests
Expand All @@ -21,7 +21,7 @@ cfgv==3.4.0
# via pre-commit
chardet==5.2.0
# via frictionless
charset-normalizer==3.3.0
charset-normalizer==3.3.1
# via requests
ckanapi==4.7
# via hdx-python-api
Expand All @@ -31,7 +31,7 @@ colorama==0.4.6
# via typer
coverage[toml]==7.3.2
# via pytest-cov
cryptography==41.0.4
cryptography==41.0.5
# via pyopenssl
defopt==6.4.0
# via hdx-python-api
Expand All @@ -45,7 +45,7 @@ docopt==0.6.2
# num2words
docutils==0.20.1
# via defopt
email-validator==2.0.0.post2
email-validator==2.1.0.post1
# via hdx-python-api
et-xmlfile==1.1.0
# via openpyxl
Expand All @@ -61,9 +61,9 @@ google-auth-oauthlib==1.1.0
# via gspread
greenlet==3.0.0
# via sqlalchemy
gspread==5.11.3
gspread==5.12.0
# via hdx-python-scraper
hapi-schema==0.3.1
hapi-schema==0.3.2
# via hapi-pipelines (pyproject.toml)
hdx-python-api==6.1.3
# via hdx-python-scraper
Expand All @@ -73,7 +73,7 @@ hdx-python-country==3.5.7
# hdx-python-api
hdx-python-database[postgresql]==1.2.9
# via hapi-pipelines (pyproject.toml)
hdx-python-scraper==2.2.1
hdx-python-scraper==2.2.2
# via hapi-pipelines (pyproject.toml)
hdx-python-utilities==3.6.2
# via hdx-python-country
Expand Down Expand Up @@ -113,7 +113,7 @@ makefun==1.15.1
# via hdx-python-api
markdown-it-py==3.0.0
# via rich
marko==2.0.0
marko==2.0.1
# via frictionless
markupsafe==2.1.3
# via jinja2
Expand All @@ -123,7 +123,7 @@ ndg-httpsclient==0.5.1
# via hdx-python-api
nodeenv==1.8.0
# via pre-commit
num2words==0.5.12
num2words==0.5.13
# via quantulum3
oauthlib==3.2.2
# via requests-oauthlib
Expand Down Expand Up @@ -175,7 +175,7 @@ pyphonetics==0.5.3
# via hdx-python-country
pyrsistent==0.19.3
# via jsonschema
pytest==7.4.2
pytest==7.4.3
# via
# hapi-pipelines (pyproject.toml)
# pytest-cov
Expand Down Expand Up @@ -220,11 +220,11 @@ rich==13.6.0
# via typer
rsa==4.9
# via google-auth
ruamel-yaml==0.17.35
ruamel-yaml==0.18.2
# via hdx-python-utilities
ruamel-yaml-clib==0.2.8
# via ruamel-yaml
shellingham==1.5.3
shellingham==1.5.4
# via typer
simpleeval==0.9.13
# via frictionless
Expand Down Expand Up @@ -268,21 +268,21 @@ unidecode==1.3.7
# via
# libhxl
# pyphonetics
urllib3==2.0.6
urllib3==2.0.7
# via
# libhxl
# requests
validators==0.22.0
# via frictionless
virtualenv==20.24.5
virtualenv==20.24.6
# via pre-commit
wheel==0.41.2
# via libhxl
xlrd==2.0.1
# via hdx-python-utilities
xlrd3==1.1.0
# via libhxl
xlsxwriter==3.1.8
xlsxwriter==3.1.9
# via tableschema-to-template
xlwt==1.3.0
# via hdx-python-utilities
Expand Down
4 changes: 2 additions & 2 deletions src/hapi/pipelines/database/metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ def populate(self):
hdx_id=dataset_id,
hdx_stub=dataset["hdx_stub"],
title=dataset["title"],
provider_code=dataset["provider_code"],
provider_name=dataset["provider_name"],
hdx_provider_stub=dataset["hdx_provider_stub"],
hdx_provider_name=dataset["hdx_provider_name"],
)
self._session.add(dataset_row)
self._session.commit()
Expand Down

0 comments on commit d004061

Please sign in to comment.