.drone.yml: add Python 3.11

2025-09-13 15:17:03 +02:00 · 2022-10-25 10:47:16 +03:00
7 changed files with 365 additions and 608 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,3 +1,33 @@
+---
+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 ({country} → {un_region}): {Fore.RESET}{row[title_column_name]}"
+                    f"{Fore.YELLOW}Missing region ({un_region}): {Fore.RESET}{row[title_column_name]}"
                )

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

 [tool.poetry.dependencies]
 python = "^3.8"
-pandas = "^1.5.1"
-python-stdnum = "^1.17"
+pandas = "^1.4.0"
+python-stdnum = "^1.13"
 requests = "^2.28.1"
-requests-cache = "^0.9.7"
+requests-cache = "^0.9.6"
+pycountry = "^22.3.5"
 langid = "^1.1.6"
 colorama = "^0.4.5"
 spdx-license-list = "^0.5.2"
 ftfy = "^6.1.1"
-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"}
+country-converter = "^0.7.7"

 [tool.poetry.dev-dependencies]
-pytest = "^7.2.0"
+pytest = "^7.1.3"
 flake8 = "^5.0.4"
 pytest-clarity = "^1.0.1"
-black = "^22.10.0"
+black = "^22.8.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,80 +3,66 @@ 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.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"
+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"
 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.6 ; python_version >= "3.8" and python_version < "4.0"
+colorama==0.4.5 ; python_version >= "3.8" and python_version < "4.0"
 commonmark==0.9.1 ; 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"
+country-converter==0.7.7 ; 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.4 ; python_version >= "3.8" and python_version < "3.11"
-executing==1.2.0 ; python_version >= "3.8" and python_version < "4.0"
+exceptiongroup==1.0.0rc9 ; python_version >= "3.8" and python_version <= "3.10"
 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==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"
+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"
 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.5 ; python_version < "4.0" and python_version >= "3.8"
+numpy==1.23.2 ; 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.5.2 ; python_version >= "3.8" and python_version < "4.0"
+pandas==1.4.4 ; python_version >= "3.8" and python_version < "4.0"
 parsedatetime==2.4 ; 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"
+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"
 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"
-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"
+py==1.11.0 ; python_version >= "3.8" and python_version < "4.0"
 pycodestyle==2.9.1 ; 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"
+pycountry==22.3.5 ; python_version >= "3.8" and python_version < "4"
 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.2.0 ; python_version >= "3.8" and python_version < "4.0"
+pytest==7.1.3 ; 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==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"
+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"
 pytimeparse==1.1.8 ; 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"
+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"
 requests==2.28.1 ; python_version >= "3.8" and python_version < "4"
-rich==12.6.0 ; python_version >= "3.8" and python_version < "4.0"
+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"
 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.44 ; python_version >= "3.8" and python_version < "4.0"
-stack-data==0.6.2 ; python_version >= "3.8" and python_version < "4.0"
+sqlalchemy==1.4.40 ; 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_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"
+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"
 url-normalize==1.4.3 ; python_version >= "3.8" and python_version < "4.0"
-urllib3==1.26.13 ; python_version >= "3.8" and python_version < "4"
+urllib3==1.26.12 ; 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,24 +1,25 @@
 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.2.0 ; python_version >= "3.8" and python_version < "4.0"
-certifi==2022.9.24 ; python_version >= "3.8" and python_version < "4"
+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"
 charset-normalizer==2.1.1 ; python_version >= "3.8" and python_version < "4"
-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"
+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"
 ftfy==6.1.1 ; python_version >= "3.8" and python_version < "4"
-idna==3.4 ; python_version >= "3.8" and python_version < "4"
+idna==3.3 ; python_version >= "3.8" and python_version < "4"
 langid==1.1.6 ; python_version >= "3.8" and python_version < "4.0"
-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"
+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"
 python-dateutil==2.8.2 ; 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"
+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"
 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.13 ; python_version >= "3.8" and python_version < "4"
+urllib3==1.26.12 ; python_version >= "3.8" and python_version < "4"
 wcwidth==0.2.5 ; python_version >= "3.8" and python_version < "4"