Merge branch 'develop_install' into 'master'

Fix install in develop mode See merge request World/OpenPaperwork/libpillowfight!13
GerHobbelt · Aug 21, 2020 · 4ccaad1 · 4ccaad1
2 parents 4af0520 + f8a31e6
commit 4ccaad1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -49,6 +49,7 @@ nosetests.xml
 coverage.xml
 *,cover
 .hypothesis/
+.pytest_cache/
 
 # Translations
 *.mo

diff --git a/pytest.ini b/pytest.ini
@@ -0,0 +1,3 @@
+[pytest]
+addopts = -v --cov=pillowfight --cov-report=term-missing --cov-branch
+python_files = tests/tests_*.py
diff --git a/setup.py b/setup.py
@@ -57,7 +57,7 @@
         'pillowfight',
     ],
     package_dir={
-        'pillowfight': 'src/pillowfight',
+        '': 'src',
     },
     ext_modules=[
         Extension(

diff --git a/tox.ini b/tox.ini
@@ -2,8 +2,17 @@
 envlist=py3
 
 [testenv]
-deps=nose
-commands=./setup.py nosetests
+deps=
+    pytest
+    pytest-cov
+# The two following lines have the same meaning but whitelist_externals option
+# is deprecated for versions >=3.18 and allowlist_externals is only recognized
+# for versions >=3.18
+whitelist_externals=make
+allowlist_externals=make
+commands=
+    make version
+    pytest
 
 [flake8]
 exclude =