Update requirements

Generated with poetry export: $ poetry export --without-hashes -f requirements.txt > requirements.txt $ poetry export --without-hashes --with dev -f requirements.txt > requirements-dev.txt I am trying `--without-hashes` to work around an error on pip install when running in CI: ERROR: In --require-hashes mode, all requirements must have their versions pinned with ==
csv_metadata_quality/check.py: update region output
2025-09-13 15:17:03 +02:00 · 2022-11-28 17:42:26 +03:00 · 2022-11-28 17:40:27 +03:00 · 2022-11-28 17:38:45 +03:00 · 2022-11-28 17:16:09 +03:00 · 2022-11-28 17:15:19 +03:00
7 changed files with 608 additions and 365 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,33 +1,3 @@
---
-kind: pipeline
-type: docker
-name: python311
-
-steps:
- name: test
-  image: python:3.11-slim
-  commands:
-  - id
-  - python -V
-  - apt update && apt install -y gcc g++ libicu-dev pkg-config
-  - pip install -r requirements-dev.txt
-  - pytest
-  - python setup.py install
-  # Basic test
-  - csv-metadata-quality -i data/test.csv -o /tmp/test.csv
-  # Basic test with unsafe fixes
-  - csv-metadata-quality -i data/test.csv -o /tmp/test.csv -u
-  # Geography test
-  - csv-metadata-quality -i data/test-geography.csv -o /tmp/test.csv
-  # Geography test with unsafe fixes
-  - csv-metadata-quality -i data/test-geography.csv -o /tmp/test.csv -u
-  # Test with experimental checks
-  - csv-metadata-quality -i data/test.csv -o /tmp/test.csv -e
-  # Test with AGROVOC validation
-  - csv-metadata-quality -i data/test.csv -o /tmp/test.csv --agrovoc-fields dcterms.subject
-  # Test with AGROVOC validation (and dropping invalid)
-  - csv-metadata-quality -i data/test.csv -o /tmp/test.csv --agrovoc-fields dcterms.subject -d
-
 ---
 kind: pipeline
 type: docker
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ 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/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

-## [0.6.0] = 2022-09-02
+## [0.6.0] - 2022-09-02
 ### Changed
 - Perform fix for "unnecessary" Unicode characters after we try to fix encoding
 issues with ftfy
--- a/csv_metadata_quality/check.py
+++ b/csv_metadata_quality/check.py
@@ -550,7 +550,7 @@ def countries_match_regions(row, exclude):

            if un_region != "not found" and un_region not in regions:
                print(
-                    f"{Fore.YELLOW}Missing region ({un_region}): {Fore.RESET}{row[title_column_name]}"
+                    f"{Fore.YELLOW}Missing region ({country} → {un_region}): {Fore.RESET}{row[title_column_name]}"
                )

    return
--- a/poetry.lock
+++ b/poetry.lock
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,25 +12,28 @@ csv-metadata-quality = 'csv_metadata_quality.__main__:main'

 [tool.poetry.dependencies]
 python = "^3.8"
-pandas = "^1.4.0"
-python-stdnum = "^1.13"
+pandas = "^1.5.1"
+python-stdnum = "^1.17"
 requests = "^2.28.1"
-requests-cache = "^0.9.6"
-pycountry = "^22.3.5"
+requests-cache = "^0.9.7"
 langid = "^1.1.6"
 colorama = "^0.4.5"
 spdx-license-list = "^0.5.2"
 ftfy = "^6.1.1"
-country-converter = "^0.7.7"
+country-converter = {git = "https://github.com/alanorth/country_converter.git", rev = "myanmar-region"}
+pycountry = {git = "https://github.com/alanorth/pycountry", rev = "iso-codes-4.12.0"}

 [tool.poetry.dev-dependencies]
-pytest = "^7.1.3"
+pytest = "^7.2.0"
 flake8 = "^5.0.4"
 pytest-clarity = "^1.0.1"
-black = "^22.8.0"
+black = "^22.10.0"
 isort = "^5.10.1"
 csvkit = "^1.0.7"

+[tool.poetry.group.dev.dependencies]
+ipython = "^8.7.0"
+
 [build-system]
 requires = ["poetry>=0.12"]
 build-backend = "poetry.masonry.api"
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -3,66 +3,80 @@ agate-excel==0.2.5 ; python_version >= "3.8" and python_version < "4.0"
 agate-sql==0.5.8 ; python_version >= "3.8" and python_version < "4.0"
 agate==1.6.3 ; python_version >= "3.8" and python_version < "4.0"
 appdirs==1.4.4 ; python_version >= "3.8" and python_version < "4.0"
+appnope==0.1.3 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "darwin"
+asttokens==2.1.0 ; python_version >= "3.8" and python_version < "4.0"
 attrs==22.1.0 ; python_version >= "3.8" and python_version < "4.0"
-babel==2.10.3 ; python_version >= "3.8" and python_version < "4.0"
-black==22.8.0 ; python_version >= "3.8" and python_version < "4.0"
-cattrs==22.1.0 ; python_version >= "3.8" and python_version < "4.0"
-certifi==2022.6.15 ; python_version >= "3.8" and python_version < "4"
+babel==2.11.0 ; python_version >= "3.8" and python_version < "4.0"
+backcall==0.2.0 ; python_version >= "3.8" and python_version < "4.0"
+black==22.10.0 ; python_version >= "3.8" and python_version < "4.0"
+cattrs==22.2.0 ; python_version >= "3.8" and python_version < "4.0"
+certifi==2022.9.24 ; python_version >= "3.8" and python_version < "4"
 charset-normalizer==2.1.1 ; python_version >= "3.8" and python_version < "4"
 click==8.1.3 ; python_version >= "3.8" and python_version < "4.0"
-colorama==0.4.5 ; python_version >= "3.8" and python_version < "4.0"
+colorama==0.4.6 ; python_version >= "3.8" and python_version < "4.0"
 commonmark==0.9.1 ; python_version >= "3.8" and python_version < "4.0"
-country-converter==0.7.7 ; python_version >= "3.8" and python_version < "4.0"
+country-converter @ git+https://github.com/alanorth/country_converter.git@myanmar-region ; python_version >= "3.8" and python_version < "4.0"
 csvkit==1.0.7 ; python_version >= "3.8" and python_version < "4.0"
 dbfread==2.0.7 ; python_version >= "3.8" and python_version < "4.0"
+decorator==5.1.1 ; python_version >= "3.8" and python_version < "4.0"
 et-xmlfile==1.1.0 ; python_version >= "3.8" and python_version < "4.0"
-exceptiongroup==1.0.0rc9 ; python_version >= "3.8" and python_version <= "3.10"
+exceptiongroup==1.0.4 ; python_version >= "3.8" and python_version < "3.11"
+executing==1.2.0 ; python_version >= "3.8" and python_version < "4.0"
 flake8==5.0.4 ; python_version >= "3.8" and python_version < "4.0"
 ftfy==6.1.1 ; python_version >= "3.8" and python_version < "4"
 future==0.18.2 ; python_version >= "3.8" and python_version < "4.0"
-greenlet==1.1.3 ; python_version >= "3.8" and (platform_machine == "aarch64" or platform_machine == "ppc64le" or platform_machine == "x86_64" or platform_machine == "amd64" or platform_machine == "AMD64" or platform_machine == "win32" or platform_machine == "WIN32") and python_version < "4.0"
-idna==3.3 ; python_version >= "3.8" and python_version < "4"
+greenlet==2.0.1 ; python_version >= "3.8" and (platform_machine == "aarch64" or platform_machine == "ppc64le" or platform_machine == "x86_64" or platform_machine == "amd64" or platform_machine == "AMD64" or platform_machine == "win32" or platform_machine == "WIN32") and python_version < "4.0"
+idna==3.4 ; python_version >= "3.8" and python_version < "4"
 iniconfig==1.1.1 ; python_version >= "3.8" and python_version < "4.0"
+ipython==8.7.0 ; python_version >= "3.8" and python_version < "4.0"
 isodate==0.6.1 ; python_version >= "3.8" and python_version < "4.0"
 isort==5.10.1 ; python_version >= "3.8" and python_version < "4.0"
+jedi==0.18.2 ; python_version >= "3.8" and python_version < "4.0"
 langid==1.1.6 ; python_version >= "3.8" and python_version < "4.0"
 leather==0.3.4 ; python_version >= "3.8" and python_version < "4.0"
+matplotlib-inline==0.1.6 ; python_version >= "3.8" and python_version < "4.0"
 mccabe==0.7.0 ; python_version >= "3.8" and python_version < "4.0"
 mypy-extensions==0.4.3 ; python_version >= "3.8" and python_version < "4.0"
-numpy==1.23.2 ; python_version < "4.0" and python_version >= "3.8"
+numpy==1.23.5 ; python_version < "4.0" and python_version >= "3.8"
 olefile==0.46 ; python_version >= "3.8" and python_version < "4.0"
 openpyxl==3.0.10 ; python_version >= "3.8" and python_version < "4.0"
 packaging==21.3 ; python_version >= "3.8" and python_version < "4.0"
-pandas==1.4.4 ; python_version >= "3.8" and python_version < "4.0"
+pandas==1.5.2 ; python_version >= "3.8" and python_version < "4.0"
 parsedatetime==2.4 ; python_version >= "3.8" and python_version < "4.0"
-pathspec==0.10.1 ; python_version >= "3.8" and python_version < "4.0"
-platformdirs==2.5.2 ; python_version >= "3.8" and python_version < "4.0"
+parso==0.8.3 ; python_version >= "3.8" and python_version < "4.0"
+pathspec==0.10.2 ; python_version >= "3.8" and python_version < "4.0"
+pexpect==4.8.0 ; python_version >= "3.8" and python_version < "4.0" and sys_platform != "win32"
+pickleshare==0.7.5 ; python_version >= "3.8" and python_version < "4.0"
+platformdirs==2.5.4 ; python_version >= "3.8" and python_version < "4.0"
 pluggy==1.0.0 ; python_version >= "3.8" and python_version < "4.0"
 pprintpp==0.4.0 ; python_version >= "3.8" and python_version < "4.0"
-py==1.11.0 ; python_version >= "3.8" and python_version < "4.0"
+prompt-toolkit==3.0.33 ; python_version >= "3.8" and python_version < "4.0"
+ptyprocess==0.7.0 ; python_version >= "3.8" and python_version < "4.0" and sys_platform != "win32"
+pure-eval==0.2.2 ; python_version >= "3.8" and python_version < "4.0"
 pycodestyle==2.9.1 ; python_version >= "3.8" and python_version < "4.0"
-pycountry==22.3.5 ; python_version >= "3.8" and python_version < "4"
+pycountry @ git+https://github.com/alanorth/pycountry@iso-codes-4.12.0 ; python_version >= "3.8" and python_version < "4.0"
 pyflakes==2.5.0 ; python_version >= "3.8" and python_version < "4.0"
 pygments==2.13.0 ; python_version >= "3.8" and python_version < "4.0"
 pyparsing==3.0.9 ; python_version >= "3.8" and python_version < "4.0"
 pytest-clarity==1.0.1 ; python_version >= "3.8" and python_version < "4.0"
-pytest==7.1.3 ; python_version >= "3.8" and python_version < "4.0"
+pytest==7.2.0 ; python_version >= "3.8" and python_version < "4.0"
 python-dateutil==2.8.2 ; python_version >= "3.8" and python_version < "4.0"
-python-slugify==6.1.2 ; python_version >= "3.8" and python_version < "4.0"
-python-stdnum==1.17 ; python_version >= "3.8" and python_version < "4.0"
+python-slugify==7.0.0 ; python_version >= "3.8" and python_version < "4.0"
+python-stdnum==1.18 ; python_version >= "3.8" and python_version < "4.0"
 pytimeparse==1.1.8 ; python_version >= "3.8" and python_version < "4.0"
-pytz==2022.2.1 ; python_version >= "3.8" and python_version < "4.0"
-requests-cache==0.9.6 ; python_version >= "3.8" and python_version < "4.0"
+pytz==2022.6 ; python_version >= "3.8" and python_version < "4.0"
+requests-cache==0.9.7 ; python_version >= "3.8" and python_version < "4.0"
 requests==2.28.1 ; python_version >= "3.8" and python_version < "4"
-rich==12.5.1 ; python_version >= "3.8" and python_version < "4.0"
-setuptools==65.3.0 ; python_version >= "3.8" and python_version < "4"
+rich==12.6.0 ; python_version >= "3.8" and python_version < "4.0"
 six==1.16.0 ; python_version >= "3.8" and python_version < "4.0"
 spdx-license-list==0.5.2 ; python_version >= "3.8" and python_version < "4.0"
-sqlalchemy==1.4.40 ; python_version >= "3.8" and python_version < "4.0"
+sqlalchemy==1.4.44 ; python_version >= "3.8" and python_version < "4.0"
+stack-data==0.6.2 ; python_version >= "3.8" and python_version < "4.0"
 text-unidecode==1.3 ; python_version >= "3.8" and python_version < "4.0"
-tomli==2.0.1 ; python_version >= "3.8" and python_version < "4.0"
-typing-extensions==4.3.0 ; python_version >= "3.8" and python_version < "3.10"
+tomli==2.0.1 ; python_version >= "3.8" and python_full_version < "3.11.0a7"
+traitlets==5.5.0 ; python_version >= "3.8" and python_version < "4.0"
+typing-extensions==4.4.0 ; python_version >= "3.8" and python_version < "3.10"
 url-normalize==1.4.3 ; python_version >= "3.8" and python_version < "4.0"
-urllib3==1.26.12 ; python_version >= "3.8" and python_version < "4"
+urllib3==1.26.13 ; python_version >= "3.8" and python_version < "4"
 wcwidth==0.2.5 ; python_version >= "3.8" and python_version < "4"
 xlrd==2.0.1 ; python_version >= "3.8" and python_version < "4.0"
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,25 +1,24 @@
 appdirs==1.4.4 ; python_version >= "3.8" and python_version < "4.0"
 attrs==22.1.0 ; python_version >= "3.8" and python_version < "4.0"
-cattrs==22.1.0 ; python_version >= "3.8" and python_version < "4.0"
-certifi==2022.6.15 ; python_version >= "3.8" and python_version < "4"
+cattrs==22.2.0 ; python_version >= "3.8" and python_version < "4.0"
+certifi==2022.9.24 ; python_version >= "3.8" and python_version < "4"
 charset-normalizer==2.1.1 ; python_version >= "3.8" and python_version < "4"
-colorama==0.4.5 ; python_version >= "3.8" and python_version < "4.0"
-country-converter==0.7.7 ; python_version >= "3.8" and python_version < "4.0"
-exceptiongroup==1.0.0rc9 ; python_version >= "3.8" and python_version <= "3.10"
+colorama==0.4.6 ; python_version >= "3.8" and python_version < "4.0"
+country-converter @ git+https://github.com/alanorth/country_converter.git@myanmar-region ; python_version >= "3.8" and python_version < "4.0"
+exceptiongroup==1.0.4 ; python_version >= "3.8" and python_version < "3.11"
 ftfy==6.1.1 ; python_version >= "3.8" and python_version < "4"
-idna==3.3 ; python_version >= "3.8" and python_version < "4"
+idna==3.4 ; python_version >= "3.8" and python_version < "4"
 langid==1.1.6 ; python_version >= "3.8" and python_version < "4.0"
-numpy==1.23.2 ; python_version < "4.0" and python_version >= "3.8"
-pandas==1.4.4 ; python_version >= "3.8" and python_version < "4.0"
-pycountry==22.3.5 ; python_version >= "3.8" and python_version < "4"
+numpy==1.23.5 ; python_version < "4.0" and python_version >= "3.8"
+pandas==1.5.2 ; python_version >= "3.8" and python_version < "4.0"
+pycountry @ git+https://github.com/alanorth/pycountry@iso-codes-4.12.0 ; python_version >= "3.8" and python_version < "4.0"
 python-dateutil==2.8.2 ; python_version >= "3.8" and python_version < "4.0"
-python-stdnum==1.17 ; python_version >= "3.8" and python_version < "4.0"
-pytz==2022.2.1 ; python_version >= "3.8" and python_version < "4.0"
-requests-cache==0.9.6 ; python_version >= "3.8" and python_version < "4.0"
+python-stdnum==1.18 ; python_version >= "3.8" and python_version < "4.0"
+pytz==2022.6 ; python_version >= "3.8" and python_version < "4.0"
+requests-cache==0.9.7 ; python_version >= "3.8" and python_version < "4.0"
 requests==2.28.1 ; python_version >= "3.8" and python_version < "4"
-setuptools==65.3.0 ; python_version >= "3.8" and python_version < "4"
 six==1.16.0 ; python_version >= "3.8" and python_version < "4.0"
 spdx-license-list==0.5.2 ; python_version >= "3.8" and python_version < "4.0"
 url-normalize==1.4.3 ; python_version >= "3.8" and python_version < "4.0"
-urllib3==1.26.12 ; python_version >= "3.8" and python_version < "4"
+urllib3==1.26.13 ; python_version >= "3.8" and python_version < "4"
 wcwidth==0.2.5 ; python_version >= "3.8" and python_version < "4"
Author	SHA1	Message	Date
Alan Orth	a7bc929af8	Update requirements Some checks failed continuous-integration/drone/push Build is failing Details Generated with poetry export: $ poetry export --without-hashes -f requirements.txt > requirements.txt $ poetry export --without-hashes --with dev -f requirements.txt > requirements-dev.txt I am trying `--without-hashes` to work around an error on pip install when running in CI: ERROR: In --require-hashes mode, all requirements must have their versions pinned with ==	2022-11-28 17:42:26 +03:00
Alan Orth	141b2e1da3	csv_metadata_quality/check.py: update region output Add the country to the message about missing regions. This makes it easier to see which country is triggering the missing region error, and helps in case of debugging possible mistakes in the data coming from the country_converter library.	2022-11-28 17:40:27 +03:00
Alan Orth	7097136b7e	Use my fork of country_converter again There is an issue with the UN M.49 region for Myanmar.	2022-11-28 17:38:45 +03:00
Alan Orth	d134c93663	Update requirements Generated with poetry export: $ poetry export --without-hashes -f requirements.txt > requirements.txt $ poetry export --without-hashes --with dev -f requirements.txt > requirements-dev.txt I am trying `--without-hashes` to work around an error on pip install when running in CI: ERROR: In --require-hashes mode, all requirements must have their versions pinned with ==	2022-11-28 17:16:09 +03:00
Alan Orth	9858406894	poetry.lock: run poetry update	2022-11-28 17:15:19 +03:00
Alan Orth	b02f1f65ee	pyproject.toml: use upstream country_converter Version 0.8.0 has the country and UN M.49 region fixes. See: https://github.com/konstantinstadler/country_converter/releases/tag/v0.8.0	2022-11-28 17:14:16 +03:00
Alan Orth	4d5ef38dde	pyproject.toml: add ipython to dev dependencies	2022-11-28 17:11:18 +03:00
Alan Orth	eaa8f31faf	Update requirements Some checks failed continuous-integration/drone/push Build is failing Details Generated with poetry export: $ poetry export --without-hashes -f requirements.txt > requirements.txt $ poetry export --without-hashes --with dev -f requirements.txt > requirements-dev.txt I am trying `--without-hashes` to work around an error on pip install when running in CI: ERROR: In --require-hashes mode, all requirements must have their versions pinned with ==	2022-11-08 10:22:39 +03:00
Alan Orth	df57988e5a	Use my fork of pycountry Until they update to iso-codes 4.12.0. See: https://github.com/flyingcircusio/pycountry/pull/149	2022-11-08 10:21:28 +03:00
Alan Orth	bddf4da559	Update requirements Generated with poetry export: $ poetry export --without-hashes -f requirements.txt > requirements.txt $ poetry export --without-hashes --with dev -f requirements.txt > requirements-dev.txt I am trying `--without-hashes` to work around an error on pip install when running in CI: ERROR: In --require-hashes mode, all requirements must have their versions pinned with ==	2022-11-08 10:06:26 +03:00
Alan Orth	15f52f8be8	Switch to my fork of country-converter Until a few issues are resolved regarding new countries and regions. See: https://github.com/konstantinstadler/country_converter/pull/122 See: https://github.com/konstantinstadler/country_converter/pull/123	2022-11-08 10:04:31 +03:00
Alan Orth	bc909464c7	Update requirements All checks were successful continuous-integration/drone/push Build is passing Details Generated with poetry export: $ poetry export --without-hashes -f requirements.txt > requirements.txt $ poetry export --without-hashes --with dev -f requirements.txt > requirements-dev.txt I am trying `--without-hashes` to work around an error on pip install when running in CI: ERROR: In --require-hashes mode, all requirements must have their versions pinned with ==	2022-11-07 12:14:46 +03:00
Alan Orth	2d46259dfe	poetry.lock: run poetry update	2022-11-07 12:13:44 +03:00
Alan Orth	ca82820a8e	pyproject.toml: update dependencies to latest	2022-11-07 12:13:28 +03:00
Alan Orth	86b4e5e182	Update requirements All checks were successful continuous-integration/drone/push Build is passing Details Generated with poetry export: $ poetry export --without-hashes -f requirements.txt > requirements.txt $ poetry export --without-hashes --with dev -f requirements.txt > requirements-dev.txt I am trying `--without-hashes` to work around an error on pip install when running in CI: ERROR: In --require-hashes mode, all requirements must have their versions pinned with ==	2022-11-01 12:21:41 +03:00
Alan Orth	e5d5ae7e5d	poetry.lock: run poetry update	2022-11-01 12:20:43 +03:00
Alan Orth	8f3db86a36	CHANGELOG.md: fix header All checks were successful continuous-integration/drone/push Build is passing Details	2022-10-31 11:43:14 +03:00