poetry.lock

@@ -189,17 +189,10 @@ description = "The country converter (coco) - a Python package for converting co
 category = "main"
 optional = false
 python-versions = "*"
-develop = false
 
 [package.dependencies]
 pandas = ">=1.0"
 
-[package.source]
-type = "git"
-url = "https://github.com/alanorth/country_converter.git"
-reference = "fixes-for-upstream"
-resolved_reference = "93992c4c8d8b12967b5767be6ef0584a8300db52"
-
 [[package]]
 name = "csvkit"
 version = "1.0.7"
@@ -487,18 +480,14 @@ python-versions = ">=3.6"
 
 [[package]]
 name = "pycountry"
-version = "22.3.6.dev0"
+version = "22.3.5"
 description = "ISO country, subdivision, language, currency and script definitions and their translations"
 category = "main"
 optional = false
-python-versions = ">=3.7"
-develop = false
+python-versions = ">=3.6, <4"
 
-[package.source]
-type = "git"
-url = "https://github.com/alanorth/pycountry"
-reference = "iso-codes-4.12.0"
-resolved_reference = "7abda245295da5280de172ceb9bbf2f6f1336e57"
+[package.dependencies]
+setuptools = "*"
 
 [[package]]
 name = "pyflakes"
@@ -678,6 +667,19 @@ typing-extensions = {version = ">=4.0.0,<5.0", markers = "python_version < \"3.9
 [package.extras]
 jupyter = ["ipywidgets (>=7.5.1,<8.0.0)"]
 
+[[package]]
+name = "setuptools"
+version = "65.5.1"
+description = "Easily download, build, install, upgrade, and uninstall Python packages"
+category = "main"
+optional = false
+python-versions = ">=3.7"
+
+[package.extras]
+docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
+testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
+testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
+
 [[package]]
 name = "six"
 version = "1.16.0"
@@ -798,7 +800,7 @@ test = ["pytest", "pytest-cov"]
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.8"
-content-hash = "d8fb013310942a8960c6ced2bf7ff4f2a826d2bfae16125134471eca90eaf8f2"
+content-hash = "9a76e08695dcda96179da1f85c3f82479dad3c2b2e95693f38b8a5d5a2f4a4b6"
 
 [metadata.files]
 agate = [
@@ -876,7 +878,9 @@ commonmark = [
     {file = "commonmark-0.9.1-py2.py3-none-any.whl", hash = "sha256:da2f38c92590f83de410ba1a3cbceafbc74fee9def35f9251ba9a971d6d66fd9"},
     {file = "commonmark-0.9.1.tar.gz", hash = "sha256:452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60"},
 ]
-country-converter = []
+country-converter = [
+    {file = "country_converter-0.7.7.tar.gz", hash = "sha256:f980bdc53db2f174b07450c9e3eb0f475c705579cf4175b37f368d83bc688f63"},
+]
 csvkit = [
     {file = "csvkit-1.0.7-py2.py3-none-any.whl", hash = "sha256:a731ed825297737b00499d0e36c4c6435af89e9018ec5ca2f2dad2ebf90cc55a"},
     {file = "csvkit-1.0.7.tar.gz", hash = "sha256:0019e29ccadfe3d5cb0d159a443cba3ce8dfc37c967317db983ce3f19f0ca050"},
@@ -1091,7 +1095,9 @@ pycodestyle = [
     {file = "pycodestyle-2.9.1-py2.py3-none-any.whl", hash = "sha256:d1735fc58b418fd7c5f658d28d943854f8a849b01a5d0a1e6f3f3fdd0166804b"},
     {file = "pycodestyle-2.9.1.tar.gz", hash = "sha256:2c9607871d58c76354b697b42f5d57e1ada7d261c261efac224b664affdc5785"},
 ]
-pycountry = []
+pycountry = [
+    {file = "pycountry-22.3.5.tar.gz", hash = "sha256:b2163a246c585894d808f18783e19137cb70a0c18fb36748dc01fc6f109c1646"},
+]
 pyflakes = [
     {file = "pyflakes-2.5.0-py2.py3-none-any.whl", hash = "sha256:4579f67d887f804e67edb544428f264b7b24f435b263c4614f384135cea553d2"},
     {file = "pyflakes-2.5.0.tar.gz", hash = "sha256:491feb020dca48ccc562a8c0cbe8df07ee13078df59813b83959cbdada312ea3"},
@@ -1143,6 +1149,10 @@ rich = [
     {file = "rich-12.6.0-py3-none-any.whl", hash = "sha256:a4eb26484f2c82589bd9a17c73d32a010b1e29d89f1604cd9bf3a2097b81bb5e"},
     {file = "rich-12.6.0.tar.gz", hash = "sha256:ba3a3775974105c221d31141f2c116f4fd65c5ceb0698657a11e9f295ec93fd0"},
 ]
+setuptools = [
+    {file = "setuptools-65.5.1-py3-none-any.whl", hash = "sha256:d0b9a8433464d5800cbe05094acf5c6d52a91bfac9b52bcfc4d41382be5d5d31"},
+    {file = "setuptools-65.5.1.tar.gz", hash = "sha256:e197a19aa8ec9722928f2206f8de752def0e4c9fc6953527360d1c36d94ddb2f"},
+]
 six = [
     {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
     {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},

pyproject.toml

@@ -16,12 +16,12 @@ pandas = "^1.5.1"
 python-stdnum = "^1.17"
 requests = "^2.28.1"
 requests-cache = "^0.9.7"
+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 = "fixes-for-upstream"}
-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"

requirements-dev.txt

@@ -12,7 +12,7 @@ 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"
 commonmark==0.9.1 ; python_version >= "3.8" and python_version < "4.0"
-country-converter @ git+https://github.com/alanorth/country_converter.git@fixes-for-upstream ; 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"
 et-xmlfile==1.1.0 ; python_version >= "3.8" and python_version < "4.0"
@@ -40,7 +40,7 @@ platformdirs==2.5.3 ; 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"
 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"
@@ -54,6 +54,7 @@ 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.6.0 ; python_version >= "3.8" and python_version < "4.0"
+setuptools==65.5.1 ; 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.43 ; python_version >= "3.8" and python_version < "4.0"

requirements.txt

@@ -4,19 +4,20 @@ 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.6 ; python_version >= "3.8" and python_version < "4.0"
-country-converter @ git+https://github.com/alanorth/country_converter.git@fixes-for-upstream ; 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.1 ; python_version >= "3.8" and python_version < "3.11"
 ftfy==6.1.1 ; 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.4 ; python_version >= "3.8" and python_version < "4.0"
 pandas==1.5.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"
 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.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.5.1 ; 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"