From abc86f89453a82504fb616aa81a41ff796014221 Mon Sep 17 00:00:00 2001 From: Andreas Poehlmann Date: Fri, 31 Jul 2020 15:06:04 +0200 Subject: [PATCH] paquo: more pep517 compliant config Reference #24 --- MANIFEST.in | 4 ++++ environment.yaml | 2 +- pyproject.toml | 18 +++++++++++++++++- pytest.ini | 5 ----- setup.cfg | 8 +------- 5 files changed, 23 insertions(+), 14 deletions(-) create mode 100644 MANIFEST.in delete mode 100644 pytest.ini diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..6f77c3f --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,4 @@ +prune .github +exclude .git* +exclude .*.yml +recursive-exclude . *secrets* diff --git a/environment.yaml b/environment.yaml index 70e7ac9..2d1ba33 100644 --- a/environment.yaml +++ b/environment.yaml @@ -12,7 +12,7 @@ dependencies: - jpype1>=1.0.1 - shapely - qupath - - pytest + - pytest>=6 - pytest-cov - pip: - "-e ." diff --git a/pyproject.toml b/pyproject.toml index 902b573..9198fb5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,10 +2,26 @@ requires = [ "setuptools >= 42", "wheel", - "setuptools_scm[toml]>=3.4" + "setuptools_scm[toml]>=3.4", ] build-backend = "setuptools.build_meta" + [tool.setuptools_scm] write_to = "paquo/_version.py" version_scheme = "post-release" + + +[tool.pytest.ini_options] +addopts = [ + "-v", + # (only needed by windows) disable faulthandler plugin to suppress non-fatal error msgs + "-p", "no:faulthandler", +] + + +[tool.coverage.report] +exclude_lines = [ + "pragma: no cover", + "raise NotImplementedError", +] diff --git a/pytest.ini b/pytest.ini deleted file mode 100644 index d1bba72..0000000 --- a/pytest.ini +++ /dev/null @@ -1,5 +0,0 @@ -[pytest] -addopts = - -v - # (only needed by windows) disable faulthandler plugin to suppress non-fatal error msgs - -p no:faulthandler diff --git a/setup.cfg b/setup.cfg index 184ac4a..5a817b9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -32,21 +32,15 @@ classifiers = zip_safe = False packages = find: python_requires = >=3.8 -include_package_data = True install_requires = JPype1>=1.0.1 shapely [options.extras_require] dev = - pytest + pytest>=6 pytest-cov docs = sphinx sphinxemoji - -[coverage:report] -exclude_lines = - pragma: no cover - raise NotImplementedError