diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index df2118b..3783731 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -118,4 +118,4 @@ jobs: run: | pip install pytest psutil pyinstaller>=4 FREETYPEPY_BUNDLE_FT=yes PYTHON_ARCH=64 pip install . - pytest -v freetype/__pyinstaller + pytest -v freetype/__pyinstaller/tests diff --git a/freetype/__pyinstaller/__init__.py b/freetype/__pyinstaller/__init__.py index c27432f..d8cd6aa 100644 --- a/freetype/__pyinstaller/__init__.py +++ b/freetype/__pyinstaller/__init__.py @@ -1,7 +1,7 @@ -from os.path import dirname +import os -HERE = dirname(__file__) +HERE = os.path.dirname(__file__) def get_hook_dirs(): @@ -9,4 +9,4 @@ def get_hook_dirs(): def get_test_dirs(): - return [HERE] + return [os.path.join(HERE, 'tests')] diff --git a/freetype/__pyinstaller/conftest.py b/freetype/__pyinstaller/tests/conftest.py similarity index 100% rename from freetype/__pyinstaller/conftest.py rename to freetype/__pyinstaller/tests/conftest.py diff --git a/freetype/__pyinstaller/test_freetype.py b/freetype/__pyinstaller/tests/test_freetype.py similarity index 100% rename from freetype/__pyinstaller/test_freetype.py rename to freetype/__pyinstaller/tests/test_freetype.py diff --git a/setup.py b/setup.py index 0aadb2b..da29aac 100644 --- a/setup.py +++ b/setup.py @@ -109,7 +109,7 @@ def build_extension(self, ext): author_email='Nicolas.Rougier@inria.fr', url='https://github.com/rougier/freetype-py', python_requires=">=3.7", - packages=['freetype', 'freetype.ft_enums', 'freetype.__pyinstaller'], + packages=['freetype', 'freetype.ft_enums', 'freetype.__pyinstaller', 'freetype.__pyinstaller.tests'], ext_modules=ext_modules, zip_safe=False if ext_modules else True, cmdclass=cmdclass,