Version2 (#17)

* Remove Python2 dependecies, setup with poetry

* Update to pyproject.
toml

* Cleanup readme

* Cleanup

* Fix pylint

* Fix more pylint issues

* Fix pylint again

.github/workflows/publish.yml

@@ -0,0 +1,29 @@
+name: Publish
+
+on:
+  release:
+    types:
+      - created
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+      - name: Install Poetry
+        run: |
+          python -m pip install --upgrade poetry wheel
+      - name: Install dependencies
+        run: |
+          poetry install
+      - name: Publish
+        env:
+          POETRY_PYPI_TOKEN_PYPI: ${{ secrets.POETRY_PYPI_TOKEN_PYPI }}
+        run: |
+          poetry config pypi-token.pypi $POETRY_PYPI_TOKEN_PYPI
+          poetry build
+          poetry publish

.github/workflows/pylint.yml

@@ -0,0 +1,23 @@
+name: Pylint
+
+on: [push]
+
+jobs:
+  pylint:
+    name: Pylint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+      - name: Install Poetry
+        run: |
+          python -m pip install --upgrade poetry wheel
+      - name: Install dependencies
+        run: |
+          poetry install
+      - name: Analysing the code with pylint
+        run: |
+          poetry run pylint ./ascii_canvas

.github/workflows/pytest.yml

@@ -0,0 +1,29 @@
+# .github/workflows/app.yaml
+name: Pytest
+
+on: [push]
+
+jobs:
+  tests:
+    name: Tests
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.7", "3.10", "3.x"]
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install Poetry
+        run: |
+          python -m pip install --upgrade poetry wheel
+      - name: Install dependencies
+        run: |
+          poetry install
+      - name: Run tests without coverage
+        if: ${{ matrix.python-version == 2.7 }}
+        run: |
+          poetry run pytest tests

ascii_canvas/__init__.py

@@ -1,10 +0,0 @@
-"""Stripping the python 3.6 type hints for backwards compatibility."""
-import os
-import sys
-
-
-if sys.version_info.major < 3 or (sys.version_info.major == 3 and sys.version_info.minor < 6):
-    from strip_hints import strip_on_import
-    strip_on_import(__file__, to_empty=False, no_ast=False, no_colon_move=False,
-                    only_assigns_and_defs=False, py3_also=True)
-

ascii_canvas/canvas.py

@@ -6,7 +6,7 @@
 from ascii_canvas import item as item_
 
 
-class Canvas(object):
+class Canvas:
     """Aggregate string objects onto a 2D string canvas."""
 
     BLANK = " "

ascii_canvas/item.py

@@ -4,7 +4,7 @@
 from typing import List, Union
 
 
-class Item(object):
+class Item:
     """Defined by an arbitrary text and a position on the Canvas."""
 
     def __init__(
@@ -31,14 +31,6 @@ def bbox(self) -> List[int]:
         return [0, 0, max(len(line) for line in lines), len(lines)]
 
 
-# class Item(Item):
-#     def __init__(self, text: str, position: Union[List[int], None] = None):
-#         """Hold a text and a position."""
-#         super().__init__()
-#         self._text = text
-#         self._position = position or [0, 0]
-
-
 class Line(Item):
     """A line between two points.
 
@@ -105,8 +97,7 @@ def position(self) -> List[int]:
         """Offset the position if the start is left of the end."""
         if self.start[1] <= self.end[1]:
             return self.start
-        else:
-            return [self.start[0], self.start[1] - self.bbox[3]]
+        return [self.start[0], self.start[1] - self.bbox[3]]
 
 
 class Rectangle(Item):

pyproject.toml

@@ -25,3 +25,11 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.black]
 line-length = 79
+
+[tool.pylint."MESSAGES CONTROL"]
+disable = [
+    "duplicate-code",
+    "no-else-raise",
+    "too-many-arguments",
+    "too-many-branches",
+]