From 92429781f5181f63e9f499de39fc3cf00fda96a7 Mon Sep 17 00:00:00 2001
From: Ethan Paul <24588726+enpaul@users.noreply.github.com>
Date: Mon, 30 May 2022 23:02:46 -0400
Subject: [PATCH] Restructure package for directory module structure

---
 glassy.py => glassy/__about__.py |  0
 glassy/__init__.py               |  0
 glassy/__main__.py               |  0
 glassy/py.typed                  |  0
 pyproject.toml                   |  2 +-
 tests/test_metadata.py           | 16 ++++++++--------
 tox.ini                          |  8 ++++----
 7 files changed, 13 insertions(+), 13 deletions(-)
 rename glassy.py => glassy/__about__.py (100%)
 create mode 100644 glassy/__init__.py
 create mode 100644 glassy/__main__.py
 create mode 100644 glassy/py.typed

diff --git a/glassy.py b/glassy/__about__.py
similarity index 100%
rename from glassy.py
rename to glassy/__about__.py
diff --git a/glassy/__init__.py b/glassy/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/glassy/__main__.py b/glassy/__main__.py
new file mode 100644
index 0000000..e69de29
diff --git a/glassy/py.typed b/glassy/py.typed
new file mode 100644
index 0000000..e69de29
diff --git a/pyproject.toml b/pyproject.toml
index 33e674f..f9cbc14 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,7 +6,7 @@ authors = ["Ethan Paul <24588726+enpaul@users.noreply.github.com>"]
 description = "ASCII network status map generator"
 repository = "https://github.com/enpaul/glassy/"
 packages = [
-  {include = "glassy.py"},
+  {include = "glassy/py.typed"},
   {include = "tests/*.py", format = "sdist"}
 ]
 keywords = ["terminal", "ascii", "network", "monitoring", "dashboard"]
diff --git a/tests/test_metadata.py b/tests/test_metadata.py
index 8f22a13..5bba4e1 100644
--- a/tests/test_metadata.py
+++ b/tests/test_metadata.py
@@ -7,7 +7,7 @@ from pathlib import Path
 
 import toml
 
-import glassy
+from glassy import __about__
 
 
 def test_metadata():
@@ -16,14 +16,14 @@ def test_metadata():
     with (Path(__file__).resolve().parent / ".." / "pyproject.toml").open() as infile:
         pyproject = toml.load(infile, _dict=dict)
 
-    assert pyproject["tool"]["poetry"]["name"] == glassy.__title__
-    assert pyproject["tool"]["poetry"]["version"] == glassy.__version__
-    assert pyproject["tool"]["poetry"]["license"] == glassy.__license__
-    assert pyproject["tool"]["poetry"]["description"] == glassy.__summary__
-    assert pyproject["tool"]["poetry"]["repository"] == glassy.__url__
+    assert pyproject["tool"]["poetry"]["name"] == __about__.__title__
+    assert pyproject["tool"]["poetry"]["version"] == __about__.__version__
+    assert pyproject["tool"]["poetry"]["license"] == __about__.__license__
+    assert pyproject["tool"]["poetry"]["description"] == __about__.__summary__
+    assert pyproject["tool"]["poetry"]["repository"] == __about__.__url__
     assert (
         all(
-            item in glassy.__authors__
+            item in __about__.__authors__
             for item in pyproject["tool"]["poetry"]["authors"]
         )
         is True
@@ -31,7 +31,7 @@ def test_metadata():
     assert (
         all(
             item in pyproject["tool"]["poetry"]["authors"]
-            for item in glassy.__authors__
+            for item in __about__.__authors__
         )
         is True
     )
diff --git a/tox.ini b/tox.ini
index a4dfc13..dcc5da5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,7 @@ locked_deps =
     toml
 commands =
     pytest {toxinidir}/tests/ \
-      --cov glassy \
+      --cov {toxinidir}/glassy \
       --cov-config {toxinidir}/.coveragerc \
       --cov-report term-missing
 
@@ -36,9 +36,9 @@ locked_deps =
 commands =
     pre-commit run \
       --all-files
-    pylint {toxinidir}/glassy.py \
+    pylint {toxinidir}/glassy/ \
       --rcfile {toxinidir}/.pylintrc
-    mypy {toxinidir}/glassy.py \
+    mypy {toxinidir}/glassy/ \
       --ignore-missing-imports \
       --no-strict-optional
 
@@ -70,7 +70,7 @@ locked_deps =
     safety
     poetry
 commands =
-    bandit {toxinidir}/glassy.py \
+    bandit {toxinidir}/glassy/ \
       --recursive \
       --quiet
     bandit {toxinidir}/tests/ \