diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 1eb753f..16bc624 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -8,7 +8,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-13, macos-latest] cibw_build: ["cp39-* cp310-* cp311-*"] steps: diff --git a/MANIFEST.IN b/MANIFEST.IN deleted file mode 100644 index 9531985..0000000 --- a/MANIFEST.IN +++ /dev/null @@ -1,2 +0,0 @@ -include src/pyutils.h -include install_libpostal.sh \ No newline at end of file diff --git a/build_libpypostal.py b/build_libpypostal.py new file mode 100644 index 0000000..4487112 --- /dev/null +++ b/build_libpypostal.py @@ -0,0 +1,27 @@ +from typing import Any, Dict + +from setuptools import Extension +from setuptools.command import build_ext + + +def build(setup_kwargs: Dict[str, Any]) -> None: + """Project build definition""" + + ext_modules = [ + Extension( + "libpypostal._parser", + sources=["src/pyparser.c", "src/pyutils.c"], + libraries=["postal"], + include_dirs=["/usr/local/include", "src/"], + library_dirs=["/usr/local/lib"], + extra_compile_args=["-std=c99"], + ), + ] + + setup_kwargs.update( + { + "ext_modules": ext_modules, + "cmd_class": {"build_ext": build_ext}, + "zip_safe": False, + } + ) diff --git a/install_libpostal.sh b/install_libpostal.sh deleted file mode 100755 index 49f433c..0000000 --- a/install_libpostal.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -OS=$(uname -s) - -case $OS in - Linux) - echo "Detected Linux" - # Linux-specific commands here - ;; - Darwin) - echo "Detected macOS" - # macOS-specific commands here - ;; - FreeBSD) - echo "Detected FreeBSD" - # FreeBSD-specific commands here - ;; - *) - echo "OS not supported" - # Handle unsupported OS here - ;; -esac - -cd $1 -git clone https://github.com/openvenues/libpostal -cd libpostal -git checkout tags/v1.1 -./bootstrap.sh -./configure --datadir=/tmp/libpostal_data_files --disable-data-download --disable-sse2 -make -j4 -sudo make install - -if [ "$OS" = "Linux" ]; then - sudo ldconfig -fi diff --git a/libpypostal/parser.py b/libpypostal/parser.py index 2596a43..075b96e 100644 --- a/libpypostal/parser.py +++ b/libpypostal/parser.py @@ -29,7 +29,7 @@ class LibpostalAddressComponent(str, Enum): def _parse_address( - address: str, language: str, country_code: str + address: str, language: Optional[str] = None, country_code: Optional[str] = None ) -> List[Tuple[str, str]]: from libpypostal import _parser # type: ignore # pylint: disable=no-name-in-module,import-outside-toplevel @@ -49,7 +49,7 @@ def parse_address( country_code: optional country code to help localize parsing. Returns: - Dictionary of address components with format {
: parsed value}. + Dictionary of address components with format {
: [parsed_values]}. Generally, address component lists will only have one element, but there is a possibility of multiple matches. Address components not found in the input are set to empty lists. diff --git a/poetry.lock b/poetry.lock new file mode 100644 index 0000000..19d9b40 --- /dev/null +++ b/poetry.lock @@ -0,0 +1,281 @@ +# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. + +[[package]] +name = "astroid" +version = "3.2.2" +description = "An abstract syntax tree for Python with inference support." +optional = false +python-versions = ">=3.8.0" +files = [ + {file = "astroid-3.2.2-py3-none-any.whl", hash = "sha256:e8a0083b4bb28fcffb6207a3bfc9e5d0a68be951dd7e336d5dcf639c682388c0"}, + {file = "astroid-3.2.2.tar.gz", hash = "sha256:8ead48e31b92b2e217b6c9733a21afafe479d52d6e164dd25fb1a770c7c3cf94"}, +] + +[package.dependencies] +typing-extensions = {version = ">=4.0.0", markers = "python_version < \"3.11\""} + +[[package]] +name = "colorama" +version = "0.4.6" +description = "Cross-platform colored terminal text." +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" +files = [ + {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"}, + {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, +] + +[[package]] +name = "dill" +version = "0.3.8" +description = "serialize all of Python" +optional = false +python-versions = ">=3.8" +files = [ + {file = "dill-0.3.8-py3-none-any.whl", hash = "sha256:c36ca9ffb54365bdd2f8eb3eff7d2a21237f8452b57ace88b1ac615b7e815bd7"}, + {file = "dill-0.3.8.tar.gz", hash = "sha256:3ebe3c479ad625c4553aca177444d89b486b1d84982eeacded644afc0cf797ca"}, +] + +[package.extras] +graph = ["objgraph (>=1.7.2)"] +profile = ["gprof2dot (>=2022.7.29)"] + +[[package]] +name = "exceptiongroup" +version = "1.2.1" +description = "Backport of PEP 654 (exception groups)" +optional = false +python-versions = ">=3.7" +files = [ + {file = "exceptiongroup-1.2.1-py3-none-any.whl", hash = "sha256:5258b9ed329c5bbdd31a309f53cbfb0b155341807f6ff7606a1e801a891b29ad"}, + {file = "exceptiongroup-1.2.1.tar.gz", hash = "sha256:a4785e48b045528f5bfe627b6ad554ff32def154f42372786903b7abcfe1aa16"}, +] + +[package.extras] +test = ["pytest (>=6)"] + +[[package]] +name = "iniconfig" +version = "2.0.0" +description = "brain-dead simple config-ini parsing" +optional = false +python-versions = ">=3.7" +files = [ + {file = "iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"}, + {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"}, +] + +[[package]] +name = "isort" +version = "5.13.2" +description = "A Python utility / library to sort Python imports." +optional = false +python-versions = ">=3.8.0" +files = [ + {file = "isort-5.13.2-py3-none-any.whl", hash = "sha256:8ca5e72a8d85860d5a3fa69b8745237f2939afe12dbf656afbcb47fe72d947a6"}, + {file = "isort-5.13.2.tar.gz", hash = "sha256:48fdfcb9face5d58a4f6dde2e72a1fb8dcaf8ab26f95ab49fab84c2ddefb0109"}, +] + +[package.extras] +colors = ["colorama (>=0.4.6)"] + +[[package]] +name = "mccabe" +version = "0.7.0" +description = "McCabe checker, plugin for flake8" +optional = false +python-versions = ">=3.6" +files = [ + {file = "mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"}, + {file = "mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325"}, +] + +[[package]] +name = "mypy" +version = "1.10.0" +description = "Optional static typing for Python" +optional = false +python-versions = ">=3.8" +files = [ + {file = "mypy-1.10.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:da1cbf08fb3b851ab3b9523a884c232774008267b1f83371ace57f412fe308c2"}, + {file = "mypy-1.10.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:12b6bfc1b1a66095ab413160a6e520e1dc076a28f3e22f7fb25ba3b000b4ef99"}, + {file = "mypy-1.10.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9e36fb078cce9904c7989b9693e41cb9711e0600139ce3970c6ef814b6ebc2b2"}, + {file = "mypy-1.10.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:2b0695d605ddcd3eb2f736cd8b4e388288c21e7de85001e9f85df9187f2b50f9"}, + {file = "mypy-1.10.0-cp310-cp310-win_amd64.whl", hash = "sha256:cd777b780312ddb135bceb9bc8722a73ec95e042f911cc279e2ec3c667076051"}, + {file = "mypy-1.10.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3be66771aa5c97602f382230165b856c231d1277c511c9a8dd058be4784472e1"}, + {file = "mypy-1.10.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:8b2cbaca148d0754a54d44121b5825ae71868c7592a53b7292eeb0f3fdae95ee"}, + {file = "mypy-1.10.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1ec404a7cbe9fc0e92cb0e67f55ce0c025014e26d33e54d9e506a0f2d07fe5de"}, + {file = "mypy-1.10.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e22e1527dc3d4aa94311d246b59e47f6455b8729f4968765ac1eacf9a4760bc7"}, + {file = "mypy-1.10.0-cp311-cp311-win_amd64.whl", hash = "sha256:a87dbfa85971e8d59c9cc1fcf534efe664d8949e4c0b6b44e8ca548e746a8d53"}, + {file = "mypy-1.10.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:a781f6ad4bab20eef8b65174a57e5203f4be627b46291f4589879bf4e257b97b"}, + {file = "mypy-1.10.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b808e12113505b97d9023b0b5e0c0705a90571c6feefc6f215c1df9381256e30"}, + {file = "mypy-1.10.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f55583b12156c399dce2df7d16f8a5095291354f1e839c252ec6c0611e86e2e"}, + {file = "mypy-1.10.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:4cf18f9d0efa1b16478c4c129eabec36148032575391095f73cae2e722fcf9d5"}, + {file = "mypy-1.10.0-cp312-cp312-win_amd64.whl", hash = "sha256:bc6ac273b23c6b82da3bb25f4136c4fd42665f17f2cd850771cb600bdd2ebeda"}, + {file = "mypy-1.10.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:9fd50226364cd2737351c79807775136b0abe084433b55b2e29181a4c3c878c0"}, + {file = "mypy-1.10.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:f90cff89eea89273727d8783fef5d4a934be2fdca11b47def50cf5d311aff727"}, + {file = "mypy-1.10.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fcfc70599efde5c67862a07a1aaf50e55bce629ace26bb19dc17cece5dd31ca4"}, + {file = "mypy-1.10.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:075cbf81f3e134eadaf247de187bd604748171d6b79736fa9b6c9685b4083061"}, + {file = "mypy-1.10.0-cp38-cp38-win_amd64.whl", hash = "sha256:3f298531bca95ff615b6e9f2fc0333aae27fa48052903a0ac90215021cdcfa4f"}, + {file = "mypy-1.10.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:fa7ef5244615a2523b56c034becde4e9e3f9b034854c93639adb667ec9ec2976"}, + {file = "mypy-1.10.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3236a4c8f535a0631f85f5fcdffba71c7feeef76a6002fcba7c1a8e57c8be1ec"}, + {file = "mypy-1.10.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4a2b5cdbb5dd35aa08ea9114436e0d79aceb2f38e32c21684dcf8e24e1e92821"}, + {file = "mypy-1.10.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:92f93b21c0fe73dc00abf91022234c79d793318b8a96faac147cd579c1671746"}, + {file = "mypy-1.10.0-cp39-cp39-win_amd64.whl", hash = "sha256:28d0e038361b45f099cc086d9dd99c15ff14d0188f44ac883010e172ce86c38a"}, + {file = "mypy-1.10.0-py3-none-any.whl", hash = "sha256:f8c083976eb530019175aabadb60921e73b4f45736760826aa1689dda8208aee"}, + {file = "mypy-1.10.0.tar.gz", hash = "sha256:3d087fcbec056c4ee34974da493a826ce316947485cef3901f511848e687c131"}, +] + +[package.dependencies] +mypy-extensions = ">=1.0.0" +tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} +typing-extensions = ">=4.1.0" + +[package.extras] +dmypy = ["psutil (>=4.0)"] +install-types = ["pip"] +mypyc = ["setuptools (>=50)"] +reports = ["lxml"] + +[[package]] +name = "mypy-extensions" +version = "1.0.0" +description = "Type system extensions for programs checked with the mypy type checker." +optional = false +python-versions = ">=3.5" +files = [ + {file = "mypy_extensions-1.0.0-py3-none-any.whl", hash = "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d"}, + {file = "mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"}, +] + +[[package]] +name = "packaging" +version = "24.0" +description = "Core utilities for Python packages" +optional = false +python-versions = ">=3.7" +files = [ + {file = "packaging-24.0-py3-none-any.whl", hash = "sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5"}, + {file = "packaging-24.0.tar.gz", hash = "sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9"}, +] + +[[package]] +name = "platformdirs" +version = "4.2.2" +description = "A small Python package for determining appropriate platform-specific dirs, e.g. a `user data dir`." +optional = false +python-versions = ">=3.8" +files = [ + {file = "platformdirs-4.2.2-py3-none-any.whl", hash = "sha256:2d7a1657e36a80ea911db832a8a6ece5ee53d8de21edd5cc5879af6530b1bfee"}, + {file = "platformdirs-4.2.2.tar.gz", hash = "sha256:38b7b51f512eed9e84a22788b4bce1de17c0adb134d6becb09836e37d8654cd3"}, +] + +[package.extras] +docs = ["furo (>=2023.9.10)", "proselint (>=0.13)", "sphinx (>=7.2.6)", "sphinx-autodoc-typehints (>=1.25.2)"] +test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4.3)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)"] +type = ["mypy (>=1.8)"] + +[[package]] +name = "pluggy" +version = "1.5.0" +description = "plugin and hook calling mechanisms for python" +optional = false +python-versions = ">=3.8" +files = [ + {file = "pluggy-1.5.0-py3-none-any.whl", hash = "sha256:44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669"}, + {file = "pluggy-1.5.0.tar.gz", hash = "sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1"}, +] + +[package.extras] +dev = ["pre-commit", "tox"] +testing = ["pytest", "pytest-benchmark"] + +[[package]] +name = "pylint" +version = "3.2.2" +description = "python code static checker" +optional = false +python-versions = ">=3.8.0" +files = [ + {file = "pylint-3.2.2-py3-none-any.whl", hash = "sha256:3f8788ab20bb8383e06dd2233e50f8e08949cfd9574804564803441a4946eab4"}, + {file = "pylint-3.2.2.tar.gz", hash = "sha256:d068ca1dfd735fb92a07d33cb8f288adc0f6bc1287a139ca2425366f7cbe38f8"}, +] + +[package.dependencies] +astroid = ">=3.2.2,<=3.3.0-dev0" +colorama = {version = ">=0.4.5", markers = "sys_platform == \"win32\""} +dill = [ + {version = ">=0.2", markers = "python_version < \"3.11\""}, + {version = ">=0.3.7", markers = "python_version >= \"3.12\""}, + {version = ">=0.3.6", markers = "python_version >= \"3.11\" and python_version < \"3.12\""}, +] +isort = ">=4.2.5,<5.13.0 || >5.13.0,<6" +mccabe = ">=0.6,<0.8" +platformdirs = ">=2.2.0" +tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} +tomlkit = ">=0.10.1" +typing-extensions = {version = ">=3.10.0", markers = "python_version < \"3.10\""} + +[package.extras] +spelling = ["pyenchant (>=3.2,<4.0)"] +testutils = ["gitpython (>3)"] + +[[package]] +name = "pytest" +version = "8.2.2" +description = "pytest: simple powerful testing with Python" +optional = false +python-versions = ">=3.8" +files = [ + {file = "pytest-8.2.2-py3-none-any.whl", hash = "sha256:c434598117762e2bd304e526244f67bf66bbd7b5d6cf22138be51ff661980343"}, + {file = "pytest-8.2.2.tar.gz", hash = "sha256:de4bb8104e201939ccdc688b27a89a7be2079b22e2bd2b07f806b6ba71117977"}, +] + +[package.dependencies] +colorama = {version = "*", markers = "sys_platform == \"win32\""} +exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""} +iniconfig = "*" +packaging = "*" +pluggy = ">=1.5,<2.0" +tomli = {version = ">=1", markers = "python_version < \"3.11\""} + +[package.extras] +dev = ["argcomplete", "attrs (>=19.2)", "hypothesis (>=3.56)", "mock", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"] + +[[package]] +name = "tomli" +version = "2.0.1" +description = "A lil' TOML parser" +optional = false +python-versions = ">=3.7" +files = [ + {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, + {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, +] + +[[package]] +name = "tomlkit" +version = "0.12.5" +description = "Style preserving TOML library" +optional = false +python-versions = ">=3.7" +files = [ + {file = "tomlkit-0.12.5-py3-none-any.whl", hash = "sha256:af914f5a9c59ed9d0762c7b64d3b5d5df007448eb9cd2edc8a46b1eafead172f"}, + {file = "tomlkit-0.12.5.tar.gz", hash = "sha256:eef34fba39834d4d6b73c9ba7f3e4d1c417a4e56f89a7e96e090dd0d24b8fb3c"}, +] + +[[package]] +name = "typing-extensions" +version = "4.12.1" +description = "Backported and Experimental Type Hints for Python 3.8+" +optional = false +python-versions = ">=3.8" +files = [ + {file = "typing_extensions-4.12.1-py3-none-any.whl", hash = "sha256:6024b58b69089e5a89c347397254e35f1bf02a907728ec7fee9bf0fe837d203a"}, + {file = "typing_extensions-4.12.1.tar.gz", hash = "sha256:915f5e35ff76f56588223f15fdd5938f9a1cf9195c0de25130c627e4d597f6d1"}, +] + +[metadata] +lock-version = "2.0" +python-versions = "^3.8" +content-hash = "c1170718c868deeb3e37076398ef849c2319eac50f95fd31b26ab40baf9156ec" diff --git a/pyproject.toml b/pyproject.toml index a4c0f33..59144f2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,10 +1,23 @@ -[project] +[tool.poetry] name = "libpypostal" version = "1.1.0" +description = "" +authors = ["garrett.weaver "] +readme = "README.md" -[build-system] -requires = ["setuptools"] -build-backend = "setuptools.build_meta" +[tool.poetry.dependencies] +python = "^3.8" + +[tool.poetry.group.dev.dependencies] +isort = "*" +mypy = "*" +pylint = "*" +pytest = "*" -[tool.setuptools.packages.find] -include = ["libpypostal*"] \ No newline at end of file +[tool.poetry.build] +script = "build_libpypostal.py" +generate-setup-file = true + +[build-system] +requires = ["poetry-core", "setuptools"] +build-backend = "poetry.core.masonry.api" diff --git a/setup.py b/setup.py index 0752745..3252bd0 100644 --- a/setup.py +++ b/setup.py @@ -1,33 +1,27 @@ -import ctypes.util -import subprocess -import tempfile - -from setuptools import setup, Extension - - -def _libpostal_installed() -> bool: - """Checks if libpostal is installed.""" - return ctypes.util.find_library("postal") is not None - - -def _install_libpostal() -> None: - """Installs libpostal.""" - with tempfile.TemporaryDirectory() as tempdir: - subprocess.run(["./install_libpostal.sh", tempdir], check=True) - - -# if not _libpostal_installed(): -# _install_libpostal() - -ext_modules = [ - Extension( - "libpypostal._parser", - sources=["src/pyparser.c", "src/pyutils.c"], - libraries=["postal"], - include_dirs=["/usr/local/include", "src/"], - library_dirs=["/usr/local/lib"], - extra_compile_args=["-std=c99"], - ), -] - -setup(ext_modules=ext_modules) +# -*- coding: utf-8 -*- +from setuptools import setup + +packages = \ +['libpypostal'] + +package_data = \ +{'': ['*']} + +setup_kwargs = { + 'name': 'libpypostal', + 'version': '1.1.0', + 'description': '', + 'long_description': '# pylibpostal\n\nPython wrapper for open-source libpostal project. Custom libary built internally due to lack of continued support for current Python wrapper libraries.\n\n## Usage\n\n### Install libpostal C library\n\nBy default, libpostal will be installed when the Python package is installed, but without the data.\n\nThe commands run to install are below.\n\n```\ngit clone https://github.com/openvenues/libpostal \\\n && cd libpostal \\\n && ./bootstrap.sh \\\n && ./configure --datadir=/tmp/libpostal_data_files --disable-data-download --disable-sse2 \\\n && make -j4 \\\n && make install \\\n && ldconfig\n```\n\n- `--disable-data-download` disables downloading data when installing. \n- `--disable-sse2` required for Mac M1.\n- `ldconfig` only needed for linux.\n\nSee https://github.com/openvenues/libpostal?tab=readme-ov-file#installation-maclinux for more details. \n\n### Downloading libpostal data\n\n```\nlibpostal_data download all \n```\n\n## Contributing\nTo test the project, run `poetry test`. Test files may live together with the code or in a separate\ndirectory, but in order for them to be discovered, they should end with `_test.py`\n(e.g. `pylibpostal/something_test.py` or `pylibpostal_test/something_test.py`).\n', + 'author': 'garrett.weaver', + 'author_email': 'garrett.weaver@cloudkitchens.com', + 'maintainer': 'None', + 'maintainer_email': 'None', + 'url': 'None', + 'packages': packages, + 'package_data': package_data, + 'python_requires': '>=3.8,<4.0', +} +from build_libpypostal import * +build(setup_kwargs) + +setup(**setup_kwargs) diff --git a/tests/test_parser.py b/tests/test_parser.py index f7e3806..32b13bf 100644 --- a/tests/test_parser.py +++ b/tests/test_parser.py @@ -4,12 +4,12 @@ from libpypostal import parser -@patch("libpypostal._parse_address") +@patch("libpypostal.parser._parse_address") def test_parse_address_single_match_each_component( - mock__parser_parse_address: MagicMock, + mock_parser__parse_address: MagicMock, ) -> None: test_address = "123 Bayes Way, Beverly Hills, CA 90210 US" - mock__parser_parse_address.return_value = [ + mock_parser__parse_address.return_value = [ ("123", "house_number"), ("bayes way", "road"), ("beverly hills", "city"), @@ -43,17 +43,17 @@ def test_parse_address_single_match_each_component( actual = parser.parse_address(test_address) assert actual == expected - mock__parser_parse_address.assert_called_once_with( - test_address, language=None, country=None + mock_parser__parse_address.assert_called_once_with( + test_address, language=None, country_code=None ) -@patch("libpypostal._parse_address") +@patch("libpypostal.parser._parse_address") def test_parse_address_multiple_matches_for_component( - mock__parser_parse_address: MagicMock, + mock_parser__parse_address: MagicMock, ) -> None: test_address = "123 Bayes Way, Beverly Hills, CA 90210 California US" - mock__parser_parse_address.return_value = [ + mock_parser__parse_address.return_value = [ ("123", "house_number"), ("bayes way", "road"), ("beverly hills", "city"), @@ -88,6 +88,6 @@ def test_parse_address_multiple_matches_for_component( actual = parser.parse_address(test_address) assert actual == expected - mock__parser_parse_address.assert_called_once_with( - test_address, language=None, country=None + mock_parser__parse_address.assert_called_once_with( + test_address, language=None, country_code=None )