rename test folder and cleanup packaging

.drone.jsonnet

@@ -89,7 +89,7 @@ local PipelineTest = {
       commands: [
         'pip install pipenv -qq',
         'pipenv --bare install --dev --keep-outdated',
-        'pipenv run pytest dockertidy/tests/ --cov=dockertidy/ --no-cov-on-fail',
+        'pipenv run pytest dockertidy --cov=dockertidy --no-cov-on-fail',
       ],
     },
     {
@@ -151,7 +151,7 @@ local PipelineSecurity = {
       commands: [
         'pip install pipenv -qq',
         'pipenv --bare install --dev --keep-outdated',
-        'pipenv run bandit -r ./dockertidy -x ./dockertidy/tests',
+        'pipenv run bandit -r ./dockertidy -x ./dockertidy/test',
       ],
     },
   ],

.drone.yml

@@ -65,7 +65,7 @@ steps:
   commands:
   - pip install pipenv -qq
   - pipenv --bare install --dev --keep-outdated
-  - pipenv run pytest dockertidy/tests/ --cov=dockertidy/ --no-cov-on-fail
+  - pipenv run pytest dockertidy --cov=dockertidy --no-cov-on-fail
   environment:
     PY_COLORS: 1
 
@@ -168,7 +168,7 @@ steps:
   commands:
   - pip install pipenv -qq
   - pipenv --bare install --dev --keep-outdated
-  - pipenv run bandit -r ./dockertidy -x ./dockertidy/tests
+  - pipenv run bandit -r ./dockertidy -x ./dockertidy/test
   environment:
     PY_COLORS: 1
 
@@ -540,6 +540,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: db08f11618d3ac957b55287ac41ae743df3d3b9a87a68cda3b25c1add3f0c346
+hmac: d375570b943723373904590f1138d9c8e1fc05970040ff2fd71596fa5c03d207
 
 ...

CHANGELOG.md

@@ -1,3 +1,2 @@
-* BUGFIX
+* ENHANCEMENT
-  * fix timedelta validation for env vars
+  * cleanup pypi packaging
-  * fix formatting of `exclude_container_labels`

dockertidy/test/unit/test_autostop.py

@@ -6,7 +6,7 @@ import pytest
 from dockertidy import Autostop
 
 pytest_plugins = [
-    "dockertidy.tests.fixtures.fixtures",
+    "dockertidy.test.fixtures.fixtures",
 ]
 
 

dockertidy/test/unit/test_garbagecollector.py

@@ -7,7 +7,7 @@ import requests
 from dockertidy import GarbageCollector
 
 pytest_plugins = [
-    "dockertidy.tests.fixtures.fixtures",
+    "dockertidy.test.fixtures.fixtures",
 ]
 
 

setup.cfg

@@ -11,7 +11,7 @@ known_first_party = dockertidy
 sections = FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
 force_single_line = true
 line_length = 99
-skip_glob = **/env/*,**/docs/*
+skip_glob = **/.env*,**/env/*,**/docs/*
 
 [yapf]
 based_on_style = google
@@ -25,3 +25,6 @@ filterwarnings =
     ignore::FutureWarning
     ignore:.*collections.*:DeprecationWarning
     ignore:.*pep8.*:FutureWarning
+
+[coverage:run]
+omit = **/test/*

setup.py

@@ -38,29 +38,31 @@ setup(
     keywords="docker gc prune garbage",
     author=get_property("__author__", PACKAGE_NAME),
     author_email=get_property("__email__", PACKAGE_NAME),
-    url="https://github.com/xoxys/docker-tidy",
+    url=get_property("__url__", PACKAGE_NAME),
-    license=get_property("__url__", PACKAGE_NAME),
+    license=get_property("__license__", PACKAGE_NAME),
     long_description=get_readme(),
     long_description_content_type="text/markdown",
-    packages=find_packages(exclude=["*.tests", "tests", "tests.*"]),
+    packages=find_packages(exclude=["*.test", "test", "test.*"]),
     include_package_data=True,
     zip_safe=False,
-    python_requires=">=3.5",
+    python_requires=">=3.5,<4",
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Environment :: Console",
+        "License :: OSI Approved :: Apache Software License",
         "Intended Audience :: Developers",
         "Intended Audience :: Information Technology",
         "Intended Audience :: System Administrators",
-        "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
         "Natural Language :: English",
         "Operating System :: POSIX",
-        "Programming Language :: Python :: 3 :: Only",
+        "Programming Language :: Python :: 3",
-        "Topic :: System :: Installation/Setup",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         "Topic :: System :: Systems Administration",
         "Topic :: Utilities",
         "Topic :: Software Development",
-        "Topic :: Software Development :: Documentation",
     ],
     install_requires=[
         "anyconfig==0.9.10",
@@ -88,7 +90,7 @@ setup(
         "regex==2020.2.20",
         "requests==2.23.0",
         "ruamel.yaml==0.16.10",
-        "ruamel.yaml.clib==0.2.0; platform_python_implementation == 'CPython' and python_version < '3.9'",
+        "ruamel.yaml.clib==0.2.0; platform_python_implementation == 'CPython' and python_version < '3.9'",  # noqa
         "six==1.14.0",
         "tzlocal==2.0.0",
         "urllib3==1.25.8",
@@ -98,5 +100,4 @@ setup(
     dependency_links=[],
     setup_requires=["setuptools_scm"],
     entry_points={"console_scripts": ["docker-tidy = dockertidy.__main__:main"]},
-    test_suite="tests",
 )