Merge pull request #60 from nschloe/modernize

src/ layout
nschloe · May 26, 2021 · 760c9fb · 760c9fb
2 parents b9a01a5 + fbf0f7d
commit 760c9fb
Show file tree

Hide file tree

Showing 19 changed files with 16 additions and 24 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,6 +41,6 @@ jobs:
     - name: Test with tox
       run: |
         pip install tox
-        tox
+        tox -- --cov termplotlib --cov-report xml --cov-report term
     - uses: codecov/codecov-action@v1
       if: ${{ matrix.python-version == '3.9' }}
diff --git a/README.md b/README.md
@@ -30,6 +30,7 @@ fig.plot(x, y, label="data", width=50, height=15)
 fig.show()
 ```
 produces
+<!--pytest-codeblocks:expected-output-->
 ```
     1 +---------------------------------------+
   0.8 |    **     **                          |
@@ -65,13 +66,15 @@ produces
 ![hist1](https://nschloe.github.io/termplotlib/hist1.png)
 
 Horizontal bar charts are covered as well. This
-<!--exdown-skip-->
 ```python
+import termplotlib as tpl
+
 fig = tpl.figure()
 fig.barh([3, 10, 5, 2], ["Cats", "Dogs", "Cows", "Geese"], force_ascii=True)
 fig.show()
 ```
 produces
+<!--pytest-codeblocks:expected-output-->
 ```
 Cats   [ 3]  ************
 Dogs   [10]  ****************************************

diff --git a/setup.cfg b/setup.cfg
@@ -8,10 +8,10 @@ url = https://github.com/nschloe/termplotlib
 project_urls =
     Code=https://github.com/nschloe/termplotlib
     Issues=https://github.com/nschloe/termplotlib/issues
+    Funding=https://github.com/sponsors/nschloe
 long_description = file: README.md
 long_description_content_type = text/markdown
 license = GPL-3.0-or-later
-license_file = LICENSE.txt
 classifiers =
     Development Status :: 4 - Beta
     Environment :: Console
@@ -34,7 +34,12 @@ keywords =
     matplotlib
 
 [options]
+package_dir =
+    =src
 packages = find:
 install_requires =
     importlib_metadata;python_version<"3.8"
 python_requires = >=3.6
+
+[options.packages.find]
+where=src
diff --git a/termplotlib/__about__.py → src/termplotlib/__about__.py b/termplotlib/__about__.py → src/termplotlib/__about__.py
diff --git a/termplotlib/__init__.py → src/termplotlib/__init__.py b/termplotlib/__init__.py → src/termplotlib/__init__.py
diff --git a/termplotlib/barh.py → src/termplotlib/barh.py b/termplotlib/barh.py → src/termplotlib/barh.py
diff --git a/termplotlib/figure.py → src/termplotlib/figure.py b/termplotlib/figure.py → src/termplotlib/figure.py
diff --git a/termplotlib/helpers.py → src/termplotlib/helpers.py b/termplotlib/helpers.py → src/termplotlib/helpers.py
@@ -19,6 +19,9 @@ def create_padding_tuple(padding):
 
 
 def is_unicode_standard_output():
+    if sys.stdout.encoding is None:
+        return True
+
     return hasattr(sys.stdout, "encoding") and sys.stdout.encoding.lower() in (
         "utf-8",
         "utf8",

diff --git a/termplotlib/hist.py → src/termplotlib/hist.py b/termplotlib/hist.py → src/termplotlib/hist.py
diff --git a/termplotlib/plot.py → src/termplotlib/plot.py b/termplotlib/plot.py → src/termplotlib/plot.py
diff --git a/termplotlib/subplot.py → src/termplotlib/subplot.py b/termplotlib/subplot.py → src/termplotlib/subplot.py
diff --git a/test/test_readme.py b/test/test_readme.py
diff --git a/test/test_barh.py → tests/test_barh.py b/test/test_barh.py → tests/test_barh.py
diff --git a/test/test_figure.py → tests/test_figure.py b/test/test_figure.py → tests/test_figure.py
diff --git a/test/test_hist.py → tests/test_hist.py b/test/test_hist.py → tests/test_hist.py
diff --git a/test/test_plot.py → tests/test_plot.py b/test/test_plot.py → tests/test_plot.py
diff --git a/test/test_scatter.py → tests/test_scatter.py b/test/test_scatter.py → tests/test_scatter.py
diff --git a/test/test_subplot.py → tests/test_subplot.py b/test/test_subplot.py → tests/test_subplot.py
diff --git a/tox.ini b/tox.ini
@@ -4,9 +4,9 @@ isolated_build = True
 
 [testenv]
 deps =
-    exdown
     numpy
     pytest
     pytest-cov
+    pytest-codeblocks
 commands =
-    pytest --cov {envsitepackagesdir}/termplotlib --cov-report xml --cov-report term
+    pytest {posargs} --codeblocks