diff --git a/.gitignore b/.gitignore index b3b7e756..ab89a3eb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ .env .tox dist/* +.hypothesis/ +build/ okonomiyaki/_version.py *.egg-info *.pyc diff --git a/okonomiyaki/file_formats/tests/common.py b/okonomiyaki/file_formats/tests/common.py index dc8b5b56..4a6d10bf 100644 --- a/okonomiyaki/file_formats/tests/common.py +++ b/okonomiyaki/file_formats/tests/common.py @@ -2,10 +2,10 @@ import io import os.path -from okonomiyaki import repositories +from okonomiyaki import utils DATA_DIR = os.path.join( - os.path.dirname(repositories.__file__), "tests", "data") + os.path.dirname(utils.__file__), "test_data", "eggs") ENSTALLER_EGG = os.path.join(DATA_DIR, "enstaller-4.5.0-1.egg") ETS_EGG = os.path.join(DATA_DIR, "ets-4.3.0-3.egg") @@ -28,14 +28,13 @@ # (see dcdd2492066b9a88e1cf39459c3fff99589f789d in buildsystem). # In most of those cases, the PKG-INFO is instead written as # EGG-INFO/PKG-INFO.bak (don't ask). -BROKEN_MCCABE_EGG = os.path.join(DATA_DIR, "broken_legacy_eggs", - "mccabe-0.2.1-2.egg") +BROKEN_MCCABE_EGG = os.path.join( + DATA_DIR, "broken_legacy_eggs", "mccabe-0.2.1-2.egg") UNICODE_DESCRIPTION_EGG = os.path.join(DATA_DIR, "pymongo-2.8-1.egg") with io.open( - os.path.join(DATA_DIR, "pymongo_description.txt"), - "r", encoding="utf8" -) as fp: + os.path.join(DATA_DIR, "pymongo_description.txt"), + "r", encoding="utf8") as fp: UNICODE_DESCRIPTION_TEXT = fp.read() # flake8: noqa diff --git a/okonomiyaki/repositories/__init__.py b/okonomiyaki/repositories/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/okonomiyaki/repositories/tests/__init__.py b/okonomiyaki/repositories/tests/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/okonomiyaki/repositories/tests/data/Cython-0.19.1-1.egg b/okonomiyaki/utils/test_data/eggs/Cython-0.19.1-1.egg similarity index 100% rename from okonomiyaki/repositories/tests/data/Cython-0.19.1-1.egg rename to okonomiyaki/utils/test_data/eggs/Cython-0.19.1-1.egg diff --git a/okonomiyaki/repositories/tests/data/MKL-10.3-1.egg b/okonomiyaki/utils/test_data/eggs/MKL-10.3-1.egg similarity index 100% rename from okonomiyaki/repositories/tests/data/MKL-10.3-1.egg rename to okonomiyaki/utils/test_data/eggs/MKL-10.3-1.egg diff --git a/okonomiyaki/repositories/tests/data/PySide-1.0.3-1.egg b/okonomiyaki/utils/test_data/eggs/PySide-1.0.3-1.egg similarity index 100% rename from okonomiyaki/repositories/tests/data/PySide-1.0.3-1.egg rename to okonomiyaki/utils/test_data/eggs/PySide-1.0.3-1.egg diff --git a/okonomiyaki/repositories/tests/data/PySide-1.1.0-3.egg b/okonomiyaki/utils/test_data/eggs/PySide-1.1.0-3.egg similarity index 100% rename from okonomiyaki/repositories/tests/data/PySide-1.1.0-3.egg rename to okonomiyaki/utils/test_data/eggs/PySide-1.1.0-3.egg diff --git a/okonomiyaki/repositories/tests/data/_osx64app-1.0-1.egg b/okonomiyaki/utils/test_data/eggs/_osx64app-1.0-1.egg similarity index 100% rename from okonomiyaki/repositories/tests/data/_osx64app-1.0-1.egg rename to okonomiyaki/utils/test_data/eggs/_osx64app-1.0-1.egg diff --git a/okonomiyaki/repositories/tests/data/broken_legacy_eggs/mccabe-0.2.1-2.egg b/okonomiyaki/utils/test_data/eggs/broken_legacy_eggs/mccabe-0.2.1-2.egg similarity index 100% rename from okonomiyaki/repositories/tests/data/broken_legacy_eggs/mccabe-0.2.1-2.egg rename to okonomiyaki/utils/test_data/eggs/broken_legacy_eggs/mccabe-0.2.1-2.egg diff --git a/okonomiyaki/repositories/tests/data/enstaller-4.5.0-1.egg b/okonomiyaki/utils/test_data/eggs/enstaller-4.5.0-1.egg similarity index 100% rename from okonomiyaki/repositories/tests/data/enstaller-4.5.0-1.egg rename to okonomiyaki/utils/test_data/eggs/enstaller-4.5.0-1.egg diff --git a/okonomiyaki/repositories/tests/data/ets-4.3.0-3.egg b/okonomiyaki/utils/test_data/eggs/ets-4.3.0-3.egg similarity index 100% rename from okonomiyaki/repositories/tests/data/ets-4.3.0-3.egg rename to okonomiyaki/utils/test_data/eggs/ets-4.3.0-3.egg diff --git a/okonomiyaki/repositories/tests/data/medialog.boardfile-1.6.1-1.egg b/okonomiyaki/utils/test_data/eggs/medialog.boardfile-1.6.1-1.egg similarity index 100% rename from okonomiyaki/repositories/tests/data/medialog.boardfile-1.6.1-1.egg rename to okonomiyaki/utils/test_data/eggs/medialog.boardfile-1.6.1-1.egg diff --git a/okonomiyaki/repositories/tests/data/numexpr-2.2.2-3.egg b/okonomiyaki/utils/test_data/eggs/numexpr-2.2.2-3.egg similarity index 100% rename from okonomiyaki/repositories/tests/data/numexpr-2.2.2-3.egg rename to okonomiyaki/utils/test_data/eggs/numexpr-2.2.2-3.egg diff --git a/okonomiyaki/repositories/tests/data/pip-6.0.8-1.egg b/okonomiyaki/utils/test_data/eggs/pip-6.0.8-1.egg similarity index 100% rename from okonomiyaki/repositories/tests/data/pip-6.0.8-1.egg rename to okonomiyaki/utils/test_data/eggs/pip-6.0.8-1.egg diff --git a/okonomiyaki/repositories/tests/data/pip-7.0.3-py3.4.egg b/okonomiyaki/utils/test_data/eggs/pip-7.0.3-py3.4.egg similarity index 100% rename from okonomiyaki/repositories/tests/data/pip-7.0.3-py3.4.egg rename to okonomiyaki/utils/test_data/eggs/pip-7.0.3-py3.4.egg diff --git a/okonomiyaki/repositories/tests/data/pymongo-2.8-1.egg b/okonomiyaki/utils/test_data/eggs/pymongo-2.8-1.egg similarity index 100% rename from okonomiyaki/repositories/tests/data/pymongo-2.8-1.egg rename to okonomiyaki/utils/test_data/eggs/pymongo-2.8-1.egg diff --git a/okonomiyaki/repositories/tests/data/pymongo_description.txt b/okonomiyaki/utils/test_data/eggs/pymongo_description.txt similarity index 100% rename from okonomiyaki/repositories/tests/data/pymongo_description.txt rename to okonomiyaki/utils/test_data/eggs/pymongo_description.txt diff --git a/okonomiyaki/repositories/tests/data/pymultinest-0.1-1.egg b/okonomiyaki/utils/test_data/eggs/pymultinest-0.1-1.egg similarity index 100% rename from okonomiyaki/repositories/tests/data/pymultinest-0.1-1.egg rename to okonomiyaki/utils/test_data/eggs/pymultinest-0.1-1.egg diff --git a/okonomiyaki/repositories/tests/data/setuptools-16.0-py3.4.egg b/okonomiyaki/utils/test_data/eggs/setuptools-16.0-py3.4.egg similarity index 100% rename from okonomiyaki/repositories/tests/data/setuptools-16.0-py3.4.egg rename to okonomiyaki/utils/test_data/eggs/setuptools-16.0-py3.4.egg diff --git a/okonomiyaki/repositories/tests/data/setuptools-40.8.0-py2.7.egg b/okonomiyaki/utils/test_data/eggs/setuptools-40.8.0-py2.7.egg similarity index 100% rename from okonomiyaki/repositories/tests/data/setuptools-40.8.0-py2.7.egg rename to okonomiyaki/utils/test_data/eggs/setuptools-40.8.0-py2.7.egg diff --git a/okonomiyaki/repositories/tests/data/supervisor-3.0-1.egg b/okonomiyaki/utils/test_data/eggs/supervisor-3.0-1.egg similarity index 100% rename from okonomiyaki/repositories/tests/data/supervisor-3.0-1.egg rename to okonomiyaki/utils/test_data/eggs/supervisor-3.0-1.egg diff --git a/okonomiyaki/repositories/tests/data/traits-4.6.0.dev235-py2.7-macosx-10.10-intel.egg b/okonomiyaki/utils/test_data/eggs/traits-4.6.0.dev235-py2.7-macosx-10.10-intel.egg similarity index 100% rename from okonomiyaki/repositories/tests/data/traits-4.6.0.dev235-py2.7-macosx-10.10-intel.egg rename to okonomiyaki/utils/test_data/eggs/traits-4.6.0.dev235-py2.7-macosx-10.10-intel.egg diff --git a/okonomiyaki/repositories/tests/data/traits-6.3.0.dev1702-py3.8-linux-x86_64.egg b/okonomiyaki/utils/test_data/eggs/traits-6.3.0.dev1702-py3.8-linux-x86_64.egg similarity index 100% rename from okonomiyaki/repositories/tests/data/traits-6.3.0.dev1702-py3.8-linux-x86_64.egg rename to okonomiyaki/utils/test_data/eggs/traits-6.3.0.dev1702-py3.8-linux-x86_64.egg diff --git a/okonomiyaki/repositories/tests/data/traits-6.3.0.dev1702-py3.8-macosx-10.14-x86_64.egg b/okonomiyaki/utils/test_data/eggs/traits-6.3.0.dev1702-py3.8-macosx-10.14-x86_64.egg similarity index 100% rename from okonomiyaki/repositories/tests/data/traits-6.3.0.dev1702-py3.8-macosx-10.14-x86_64.egg rename to okonomiyaki/utils/test_data/eggs/traits-6.3.0.dev1702-py3.8-macosx-10.14-x86_64.egg diff --git a/okonomiyaki/repositories/tests/data/traits-6.3.0.dev1702-py3.8-win-amd64.egg b/okonomiyaki/utils/test_data/eggs/traits-6.3.0.dev1702-py3.8-win-amd64.egg similarity index 100% rename from okonomiyaki/repositories/tests/data/traits-6.3.0.dev1702-py3.8-win-amd64.egg rename to okonomiyaki/utils/test_data/eggs/traits-6.3.0.dev1702-py3.8-win-amd64.egg diff --git a/okonomiyaki/repositories/tests/data/xz-5.2.0-1.egg b/okonomiyaki/utils/test_data/eggs/xz-5.2.0-1.egg similarity index 100% rename from okonomiyaki/repositories/tests/data/xz-5.2.0-1.egg rename to okonomiyaki/utils/test_data/eggs/xz-5.2.0-1.egg diff --git a/okonomiyaki/utils/test_data/wheels/traits-6.4.3-cp311-cp311-musllinux_1_1_aarch64.whl b/okonomiyaki/utils/test_data/wheels/traits-6.4.3-cp311-cp311-musllinux_1_1_aarch64.whl new file mode 100755 index 00000000..27f8e776 Binary files /dev/null and b/okonomiyaki/utils/test_data/wheels/traits-6.4.3-cp311-cp311-musllinux_1_1_aarch64.whl differ diff --git a/setup.cfg b/setup.cfg index c60fee92..46e3e48b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,8 +30,6 @@ packages = okonomiyaki.file_formats._blacklist okonomiyaki.platforms okonomiyaki.platforms.tests - okonomiyaki.repositories - okonomiyaki.repositories.tests okonomiyaki.runtimes okonomiyaki.runtimes.tests okonomiyaki.versions @@ -55,6 +53,8 @@ okonomiyaki.repositories.tests = okonomiyaki.utils.test_data = *.runtime *.runtime.invalid + eggs/*.egg + eggs/*.txt eggs/osx_arm64/cp311/*.egg eggs/osx_x86_64/cp27/*.egg eggs/osx_x86_64/cp38/*.egg @@ -69,6 +69,7 @@ okonomiyaki.utils.test_data = eggs/win_x86_64/cp38/*.egg eggs/win_x86_64/cp311/*.egg eggs/win_arm64/cp311/*.egg + eggs/broken_legacy_eggs/*.egg wheels/*.whl [options.extras_require]