From f14103cdd5454b7a3dcadede192d223146caa0b8 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Wed, 21 Sep 2022 19:59:35 +0200
Subject: [PATCH] [ci] Move into a flat structure to facilitate testing
---
MANIFEST.in | 2 +-
{src/exposed => exposed}/__init__.py | 0
{src/exposed => exposed}/click.py | 0
{src/exposed => exposed}/config.py | 0
{src/exposed => exposed}/logging.py | 0
{src/exposed => exposed}/rc.py | 0
{src/exposed => exposed}/tests/__init__.py | 0
{src/exposed => exposed}/tests/conftest.py | 0
{src/exposed => exposed}/tests/data/__init__.py | 0
{src/exposed => exposed}/tests/data/basic_config.py | 0
{src/exposed => exposed}/tests/data/complex.py | 0
{src/exposed => exposed}/tests/data/oldjson.cfg | 0
{src/exposed => exposed}/tests/data/second_config.py | 0
{src/exposed => exposed}/tests/data/test_dump_config.py | 0
{src/exposed => exposed}/tests/data/test_dump_config2.py | 0
{src/exposed => exposed}/tests/data/userdefaults_ex1.cfg | 0
{src/exposed => exposed}/tests/data/verbose_config.py | 0
{src/exposed => exposed}/tests/test_click.py | 0
{src/exposed => exposed}/tests/test_config.py | 0
{src/exposed => exposed}/tests/test_logging.py | 0
{src/exposed => exposed}/tests/test_rc.py | 0
pyproject.toml | 6 +++++-
22 files changed, 6 insertions(+), 2 deletions(-)
rename {src/exposed => exposed}/__init__.py (100%)
rename {src/exposed => exposed}/click.py (100%)
rename {src/exposed => exposed}/config.py (100%)
rename {src/exposed => exposed}/logging.py (100%)
rename {src/exposed => exposed}/rc.py (100%)
rename {src/exposed => exposed}/tests/__init__.py (100%)
rename {src/exposed => exposed}/tests/conftest.py (100%)
rename {src/exposed => exposed}/tests/data/__init__.py (100%)
rename {src/exposed => exposed}/tests/data/basic_config.py (100%)
rename {src/exposed => exposed}/tests/data/complex.py (100%)
rename {src/exposed => exposed}/tests/data/oldjson.cfg (100%)
rename {src/exposed => exposed}/tests/data/second_config.py (100%)
rename {src/exposed => exposed}/tests/data/test_dump_config.py (100%)
rename {src/exposed => exposed}/tests/data/test_dump_config2.py (100%)
rename {src/exposed => exposed}/tests/data/userdefaults_ex1.cfg (100%)
rename {src/exposed => exposed}/tests/data/verbose_config.py (100%)
rename {src/exposed => exposed}/tests/test_click.py (100%)
rename {src/exposed => exposed}/tests/test_config.py (100%)
rename {src/exposed => exposed}/tests/test_logging.py (100%)
rename {src/exposed => exposed}/tests/test_rc.py (100%)
diff --git a/MANIFEST.in b/MANIFEST.in
index 99858f7..431d9f4 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
include LICENSE README.rst
recursive-include doc *.rst *.txt *.py *.ico *.png
-recursive-include src/exposed/tests/data *.cfg
+recursive-include exposed/tests/data *.cfg
diff --git a/src/exposed/__init__.py b/exposed/__init__.py
similarity index 100%
rename from src/exposed/__init__.py
rename to exposed/__init__.py
diff --git a/src/exposed/click.py b/exposed/click.py
similarity index 100%
rename from src/exposed/click.py
rename to exposed/click.py
diff --git a/src/exposed/config.py b/exposed/config.py
similarity index 100%
rename from src/exposed/config.py
rename to exposed/config.py
diff --git a/src/exposed/logging.py b/exposed/logging.py
similarity index 100%
rename from src/exposed/logging.py
rename to exposed/logging.py
diff --git a/src/exposed/rc.py b/exposed/rc.py
similarity index 100%
rename from src/exposed/rc.py
rename to exposed/rc.py
diff --git a/src/exposed/tests/__init__.py b/exposed/tests/__init__.py
similarity index 100%
rename from src/exposed/tests/__init__.py
rename to exposed/tests/__init__.py
diff --git a/src/exposed/tests/conftest.py b/exposed/tests/conftest.py
similarity index 100%
rename from src/exposed/tests/conftest.py
rename to exposed/tests/conftest.py
diff --git a/src/exposed/tests/data/__init__.py b/exposed/tests/data/__init__.py
similarity index 100%
rename from src/exposed/tests/data/__init__.py
rename to exposed/tests/data/__init__.py
diff --git a/src/exposed/tests/data/basic_config.py b/exposed/tests/data/basic_config.py
similarity index 100%
rename from src/exposed/tests/data/basic_config.py
rename to exposed/tests/data/basic_config.py
diff --git a/src/exposed/tests/data/complex.py b/exposed/tests/data/complex.py
similarity index 100%
rename from src/exposed/tests/data/complex.py
rename to exposed/tests/data/complex.py
diff --git a/src/exposed/tests/data/oldjson.cfg b/exposed/tests/data/oldjson.cfg
similarity index 100%
rename from src/exposed/tests/data/oldjson.cfg
rename to exposed/tests/data/oldjson.cfg
diff --git a/src/exposed/tests/data/second_config.py b/exposed/tests/data/second_config.py
similarity index 100%
rename from src/exposed/tests/data/second_config.py
rename to exposed/tests/data/second_config.py
diff --git a/src/exposed/tests/data/test_dump_config.py b/exposed/tests/data/test_dump_config.py
similarity index 100%
rename from src/exposed/tests/data/test_dump_config.py
rename to exposed/tests/data/test_dump_config.py
diff --git a/src/exposed/tests/data/test_dump_config2.py b/exposed/tests/data/test_dump_config2.py
similarity index 100%
rename from src/exposed/tests/data/test_dump_config2.py
rename to exposed/tests/data/test_dump_config2.py
diff --git a/src/exposed/tests/data/userdefaults_ex1.cfg b/exposed/tests/data/userdefaults_ex1.cfg
similarity index 100%
rename from src/exposed/tests/data/userdefaults_ex1.cfg
rename to exposed/tests/data/userdefaults_ex1.cfg
diff --git a/src/exposed/tests/data/verbose_config.py b/exposed/tests/data/verbose_config.py
similarity index 100%
rename from src/exposed/tests/data/verbose_config.py
rename to exposed/tests/data/verbose_config.py
diff --git a/src/exposed/tests/test_click.py b/exposed/tests/test_click.py
similarity index 100%
rename from src/exposed/tests/test_click.py
rename to exposed/tests/test_click.py
diff --git a/src/exposed/tests/test_config.py b/exposed/tests/test_config.py
similarity index 100%
rename from src/exposed/tests/test_config.py
rename to exposed/tests/test_config.py
diff --git a/src/exposed/tests/test_logging.py b/exposed/tests/test_logging.py
similarity index 100%
rename from src/exposed/tests/test_logging.py
rename to exposed/tests/test_logging.py
diff --git a/src/exposed/tests/test_rc.py b/exposed/tests/test_rc.py
similarity index 100%
rename from src/exposed/tests/test_rc.py
rename to exposed/tests/test_rc.py
diff --git a/pyproject.toml b/pyproject.toml
index 4d08b0b..9fd533c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -61,6 +61,11 @@ error-config = "exposed.tests.data.doesnt_exist"
[tool.setuptools]
zip-safe = false
+packages = [
+ "exposed",
+ "exposed.tests",
+ "exposed.tests.data",
+ ]
[tool.setuptools.dynamic]
version = {file = "version.txt"}
@@ -87,5 +92,4 @@ addopts = [
"--cov-report=html:html/coverage",
"--cov-report=xml:coverage.xml",
"--junitxml=junit-coverage.xml",
- "--pyargs", "exposed",
]
--
GitLab