Drop Python 3.5 support.

HexDecimal · HexDecimal · commit 5f508f7d639d · 2021-01-22T09:44:03.000-08:00
diff --git a/.github/workflows/python-package-macos.yml b/.github/workflows/python-package-macos.yml
@@ -48,7 +48,7 @@ jobs:
       env:
         TCOD_TAG: ${{ github.event.release.tag_name }}
       run: |
-        python setup.py sdist develop bdist_wheel --py-limited-api=cp35
+        python setup.py sdist develop bdist_wheel --py-limited-api=cp36
     - name: Test with pytest
       run: |
         pytest --no-window --cov-report=xml
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -43,6 +43,7 @@ jobs:
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
         flake8 tcod/ --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
     - name: Check type hints with MyPy
+      if: ${{ matrix.python-version != '3.6' }}
       run: |
         mypy tcod/
     - name: Check formatting with Black
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -8,6 +8,8 @@ v2.0.0
 
 Unreleased
 ------------------
+Removed
+ - Python 3.5 is no longer supported.
 
 11.19.3 - 2021-01-07
 --------------------
diff --git a/appveyor.yml b/appveyor.yml
@@ -10,15 +10,12 @@ environment:
   DEPLOY_ONLY: false
   EXTRA_SETUP_ARGS: ""
   matrix:
-  - PYTHON: C:\Python35-x64\python.exe
-    platform: x64
-    EXTRA_SETUP_ARGS: "--py-limited-api cp35"
-  - PYTHON: C:\Python35\python.exe
-    platform: Any CPU
-    EXTRA_SETUP_ARGS: "--py-limited-api cp35"
   - PYTHON: C:\Python36-x64\python.exe
     platform: x64
-    NO_DEPLOY: true
+    EXTRA_SETUP_ARGS: "--py-limited-api cp36"
+  - PYTHON: C:\Python36\python.exe
+    platform: Any CPU
+    EXTRA_SETUP_ARGS: "--py-limited-api cp36"
   - PYTHON: C:\Python37-x64\python.exe
     platform: x64
     NO_DEPLOY: true
diff --git a/build_libtcod.py b/build_libtcod.py
@@ -207,7 +207,7 @@ def unpack_sdl2(version: str) -> str:
 
 libraries = []
 library_dirs = []
-define_macros = [("Py_LIMITED_API", 0x03050000)]  # type: List[Tuple[str, Any]]
+define_macros = [("Py_LIMITED_API", 0x03060000)]  # type: List[Tuple[str, Any]]
 
 sources += walk_sources("tcod/", cpp=True)
 sources += walk_sources("libtcod/src/libtcod/", cpp=False)
diff --git a/pyproject.toml b/pyproject.toml
@@ -8,11 +8,11 @@ requires = [
 
 [tool.black]
 line-length = 79
-py36 = false
-target-version = ["py35"]
+py36 = true
+target-version = ["py36"]
 
 [tool.isort]
 profile= "black"
-py_version = "35"
+py_version = "36"
 skip_gitignore = true
 line_length = 79
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,6 @@
 cffi~=1.13
-numpy~=1.10,!=1.16.3;
+numpy>=1.20.0rc1; python_version >= '3.7'
+numpy>=1.19.5; python_version <= '3.6'
 pycparser>=2.14
 setuptools>=36.0.1
 typing_extensions
diff --git a/setup.cfg b/setup.cfg
@@ -14,7 +14,7 @@ filterwarnings =
 ignore = E203 W503
 
 [mypy]
-python_version = 3.5
+python_version = 3.6
 warn_unused_configs = True
 disallow_subclassing_any = True
 disallow_any_generics = True
diff --git a/setup.py b/setup.py
@@ -136,7 +136,7 @@ def check_sdl_version():
     py_modules=["libtcodpy"],
     packages=["tdl", "tcod"],
     package_data={"tdl": ["*.png"], "tcod": get_package_data()},
-    python_requires=">=3.5",
+    python_requires=">=3.6",
     install_requires=[
         "cffi~=1.13",  # Also required by pyproject.toml.
         "numpy~=1.10" if not is_pypy else "",
@@ -157,7 +157,6 @@ def check_sdl_version():
         "Operating System :: MacOS :: MacOS X",
         "Operating System :: Microsoft :: Windows",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
diff --git a/tcod/console.py b/tcod/console.py
@@ -230,7 +230,7 @@ def ch(self) -> np.ndarray:
         Index this array with ``console.ch[i, j]  # order='C'`` or
         ``console.ch[x, y]  # order='F'``.
         """
-        return self._tiles["ch"].T if self._order == "F" else self._tiles["ch"]
+        return self._tiles["ch"].T if self._order == "F" else self._tiles["ch"]  # type: ignore
 
     @property
     def tiles(self) -> np.ndarray:
diff --git a/tcod/context.py b/tcod/context.py
@@ -178,7 +178,7 @@ def present(
         keep_aspect: bool = False,
         integer_scaling: bool = False,
         clear_color: Tuple[int, int, int] = (0, 0, 0),
-        align: Tuple[float, float] = (0.5, 0.5)
+        align: Tuple[float, float] = (0.5, 0.5),
     ) -> None:
         """Present a console to this context's display.
 
@@ -387,7 +387,7 @@ def new(
     vsync: bool = True,
     sdl_window_flags: Optional[int] = None,
     title: Optional[str] = None,
-    argv: Optional[Iterable[str]] = None
+    argv: Optional[Iterable[str]] = None,
 ) -> Context:
     """Create a new context with the desired pixel size.
 
@@ -490,7 +490,7 @@ def new_window(
     tileset: Optional[tcod.tileset.Tileset] = None,
     vsync: bool = True,
     sdl_window_flags: Optional[int] = None,
-    title: Optional[str] = None
+    title: Optional[str] = None,
 ) -> Context:
     """Create a new context with the desired pixel size.
 
@@ -519,7 +519,7 @@ def new_terminal(
     tileset: Optional[tcod.tileset.Tileset] = None,
     vsync: bool = True,
     sdl_window_flags: Optional[int] = None,
-    title: Optional[str] = None
+    title: Optional[str] = None,
 ) -> Context:
     """Create a new context with the desired console size.
 
diff --git a/tcod/libtcodpy.py b/tcod/libtcodpy.py
@@ -492,7 +492,7 @@ def __init__(
         cy: int = 0,
         dcx: int = 0,
         dcy: int = 0,
-        **kargs: Any
+        **kargs: Any,
     ):
         if isinstance(x, ffi.CData):
             self.cdata = x
@@ -1221,7 +1221,7 @@ def console_flush(
         0,
         0,
     ),
-    align: Tuple[float, float] = (0.5, 0.5)
+    align: Tuple[float, float] = (0.5, 0.5),
 ) -> None:
     """Update the display to represent the root consoles current state.
 
diff --git a/tcod/map.py b/tcod/map.py
@@ -277,4 +277,4 @@ def compute_fov(
     lib.TCOD_map_compute_fov(
         map_cdata, pov[1], pov[0], radius, light_walls, algorithm
     )
-    return map_buffer["fov"]
+    return map_buffer["fov"]  # type: ignore
diff --git a/tcod/path.py b/tcod/path.py
@@ -117,7 +117,7 @@ def __init__(
         super(EdgeCostCallback, self).__init__(callback, shape)
 
 
-class NodeCostArray(np.ndarray):  # type: ignore
+class NodeCostArray(np.ndarray):
     """Calculate cost from a numpy array of nodes.
 
     `array` is a NumPy array holding the path-cost of each node.
@@ -138,7 +138,7 @@ class NodeCostArray(np.ndarray):  # type: ignore
     def __new__(cls, array: np.ndarray) -> "NodeCostArray":
         """Validate a numpy array and setup a C callback."""
         self = np.asarray(array).view(cls)
-        return self  # type: ignore
+        return self
 
     def __repr__(self) -> str:
         return "%s(%r)" % (
@@ -373,7 +373,7 @@ def dijkstra2d(
     cardinal: Optional[int] = None,
     diagonal: Optional[int] = None,
     *,
-    edge_map: Any = None
+    edge_map: Any = None,
 ) -> None:
     """Return the computed distance of all nodes on a 2D Dijkstra grid.
 
@@ -524,7 +524,7 @@ def hillclimb2d(
     cardinal: Optional[bool] = None,
     diagonal: Optional[bool] = None,
     *,
-    edge_map: Any = None
+    edge_map: Any = None,
 ) -> np.ndarray:
     """Return a path on a grid from `start` to the lowest point.
 
@@ -697,7 +697,7 @@ def add_edge(
         edge_cost: int = 1,
         *,
         cost: np.ndarray,
-        condition: Optional[np.ndarray] = None
+        condition: Optional[np.ndarray] = None,
     ) -> None:
         """Add a single edge rule.
 
@@ -799,7 +799,7 @@ def add_edges(
         *,
         edge_map: Any,
         cost: np.ndarray,
-        condition: Optional[np.ndarray] = None
+        condition: Optional[np.ndarray] = None,
     ) -> None:
         """Add a rule with multiple edges.
 
@@ -1190,7 +1190,7 @@ def traversal(self) -> np.ndarray:
         """
         if self._order == "F":
             axes = range(self._travel.ndim)
-            return self._travel.transpose((*axes[-2::-1], axes[-1]))[..., ::-1]
+            return self._travel.transpose((*axes[-2::-1], axes[-1]))[..., ::-1]  # type: ignore
         return self._travel
 
     def clear(self) -> None:
@@ -1379,7 +1379,7 @@ def path_from(self, index: Tuple[int, ...]) -> np.ndarray:
                 ffi.from_buffer("int*", path),
             )
         )
-        return path[:, ::-1] if self._order == "F" else path
+        return path[:, ::-1] if self._order == "F" else path  # type: ignore
 
     def path_to(self, index: Tuple[int, ...]) -> np.ndarray:
         """Return the shortest path from the nearest root to `index`.
@@ -1406,4 +1406,4 @@ def path_to(self, index: Tuple[int, ...]) -> np.ndarray:
             >>> pf.path_to((0, 0))[1:].tolist()  # Exclude the starting point so that a blocked path is an empty list.
             []
         """  # noqa: E501
-        return self.path_from(index)[::-1]
+        return self.path_from(index)[::-1]  # type: ignore
