Move package to a top-level "src" directory

.github/workflows/lint_python.yml

@@ -8,7 +8,7 @@ jobs:
       - uses: actions/setup-python@v2
       - run: pip install --upgrade pip wheel
       - run: pip install bandit black codespell flake8 flake8-bugbear
-                         flake8-comprehensions isort mypy pytest pyupgrade safety
+                         flake8-comprehensions isort mypy pyupgrade safety
       - run: bandit --recursive --skip B311 .
       - run: black --check . || true
       - run: codespell  # --ignore-words-list="" --skip="*.css,*.js,*.lock"
@@ -19,6 +19,5 @@ jobs:
       - run: pip install -r requirements.txt
       - run: mkdir --parents --verbose .mypy_cache
       - run: mypy --ignore-missing-imports --install-types --non-interactive . || true
-      - run: pytest .
       - run: shopt -s globstar && pyupgrade --py36-plus **/*.py || true
       - run: safety check

MANIFEST.in

@@ -1,2 +1,3 @@
 include LICENSE.txt CHANGELOG.rst
 recursive-include demos *.py *.bat *.sh
+recursive-include tests *.py

README.rst

@@ -297,6 +297,15 @@ them though. Let me know if it would be useful for you, via the Issues on
 GitHub.
 
 
+Demos
+-----
+
+Colorama ships with several demos that show its features. Run them the same as
+any Python script::
+
+    $ python demos/demo01.py
+
+
 Status & Known Problems
 -----------------------
 

demos/fixpath.py

@@ -4,5 +4,5 @@
 # the local source in preference to any installed version of colorama.
 import sys
 from os.path import normpath, dirname, join
-local_colorama_module = normpath(join(dirname(__file__), '..'))
+local_colorama_module = normpath(join(dirname(__file__), '..', 'src'))
 sys.path.insert(0, local_colorama_module)

setup.py

@@ -33,7 +33,7 @@ def get_version(path):
 
 setup(
     name=NAME,
-    version=get_version(os.path.join('colorama', '__init__.py')),
+    version=get_version(os.path.join('src', 'colorama', '__init__.py')),
     description='Cross-platform colored terminal text.',
     long_description=read_file('README.rst'),
     keywords='color colour terminal text ansi windows crossplatform xplatform',
@@ -43,6 +43,7 @@ def get_version(path):
     url='https://github.com/tartley/colorama',
     license='BSD',
     packages=[NAME],
+    package_dir={"": "src"},
     python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*',
     # see classifiers https://pypi.org/pypi?%3Aaction=list_classifiers
     classifiers=[

colorama/tests/ansi_test.py → tests/ansi_test.py

@@ -2,8 +2,8 @@
 import sys
 from unittest import TestCase, main
 
-from ..ansi import Back, Fore, Style
-from ..ansitowin32 import AnsiToWin32
+from colorama.ansi import Back, Fore, Style
+from colorama.ansitowin32 import AnsiToWin32
 
 stdout_orig = sys.stdout
 stderr_orig = sys.stderr

colorama/tests/ansitowin32_test.py → tests/ansitowin32_test.py

@@ -7,7 +7,7 @@
 except ImportError:
     from mock import MagicMock, Mock, patch
 
-from ..ansitowin32 import AnsiToWin32, StreamWrapper
+from colorama.ansitowin32 import AnsiToWin32, StreamWrapper
 from .utils import osname
 
 

colorama/tests/initialise_test.py → tests/initialise_test.py

@@ -7,8 +7,8 @@
 except ImportError:
     from mock import patch
 
-from ..ansitowin32 import StreamWrapper
-from ..initialise import init
+from colorama.ansitowin32 import StreamWrapper
+from colorama.initialise import init
 from .utils import osname, replace_by
 
 orig_stdout = sys.stdout

colorama/tests/isatty_test.py → tests/isatty_test.py

@@ -2,7 +2,7 @@
 import sys
 from unittest import TestCase, main
 
-from ..ansitowin32 import StreamWrapper, AnsiToWin32
+from colorama.ansitowin32 import StreamWrapper, AnsiToWin32
 from .utils import pycharm, replace_by, replace_original_by, StreamTTY, StreamNonTTY
 
 

colorama/tests/winterm_test.py → tests/winterm_test.py

@@ -7,7 +7,7 @@
 except ImportError:
     from mock import Mock, patch
 
-from ..winterm import WinColor, WinStyle, WinTerm
+from colorama.winterm import WinColor, WinStyle, WinTerm
 
 
 class WinTermTest(TestCase):

tox.ini

@@ -2,5 +2,7 @@
 envlist = py27, py35, py36, py37, py38, py39, py310, pypy, pypy3
 
 [testenv]
-deps = py27,pypy: mock
-commands = python -m unittest discover -p *_test.py
+deps =
+    pytest
+    py27,pypy: mock
+commands = pytest