Merge pull request #60 from JaskRendix/toml

pyproject.toml + isort

.github/workflows/python-app.yml

@@ -12,12 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.7', '3.8', '3.9' ]
+        python-version: ['3.7', '3.8', '3.9']
     name: Python ${{ matrix.python-version }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
           python-version: ${{ matrix.python-version }}
           architecture: x64

MANIFEST.in

@@ -0,0 +1,2 @@
+prune .github
+exclude .gitignore 

apps/demo/demo-stitched.py

@@ -13,16 +13,18 @@
 
 import pygame
 from pygame.locals import (
-    K_UP,
     K_DOWN,
-    K_LEFT,
-    K_RIGHT,
-    K_MINUS,
     K_EQUALS,
     K_ESCAPE,
+    K_LEFT,
+    K_MINUS,
+    K_RIGHT,
+    K_UP,
+    KEYDOWN,
+    QUIT,
+    VIDEORESIZE,
     K_r,
 )
-from pygame.locals import KEYDOWN, VIDEORESIZE, QUIT
 from pytmx.util_pygame import load_pygame
 
 import pyscroll

apps/demo/demo.py

@@ -10,14 +10,15 @@
 See the "Quest" tutorial for a more simple use with
 pygame sprites and groups.
 """
-from pytmx.util_pygame import load_pygame
-import pygame
-import pyscroll
-import pyscroll.data
 import collections
 import logging
+
+import pygame
 from pygame.locals import *
+from pytmx.util_pygame import load_pygame
 
+import pyscroll
+import pyscroll.data
 import pyscroll.orthographic
 
 logger = logging.getLogger(__name__)

apps/tutorial/quest.py

@@ -14,8 +14,19 @@
 from typing import List
 
 import pygame
-from pygame.locals import K_UP, K_DOWN, K_LEFT, K_RIGHT, K_MINUS, K_EQUALS, K_ESCAPE, K_r
-from pygame.locals import KEYDOWN, VIDEORESIZE, QUIT
+from pygame.locals import (
+    K_DOWN,
+    K_EQUALS,
+    K_ESCAPE,
+    K_LEFT,
+    K_MINUS,
+    K_RIGHT,
+    K_UP,
+    KEYDOWN,
+    QUIT,
+    VIDEORESIZE,
+    K_r,
+)
 from pytmx.util_pygame import load_pygame
 
 import pyscroll

docs/conf.py

@@ -12,8 +12,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 import os
+import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

pyproject.toml

@@ -0,0 +1,44 @@
+[build-system]
+requires = ["setuptools", "setuptools-scm"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "pyscroll"
+version = "2.31"
+description = "Fast scrolling maps library for pygame"
+readme = "README.md"
+license = {file = "LICENSE"}
+authors = [
+    {name = "bitcraft", email = "[email protected]"}
+]
+classifiers = [
+        "Intended Audience :: Developers",
+        "Development Status :: 5 - Production/Stable",
+        "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Topic :: Games/Entertainment",
+        "Topic :: Multimedia :: Graphics",
+        "Topic :: Software Development :: Libraries :: pygame",
+]
+requires-python = ">=3.7"
+
+[project.urls]
+source = "https://github.com/bitcraft/pyscroll"
+
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["pyscroll*"]
+
+[tool.black]
+line-length = 88
+target-version = ["py37"]
+
+[tool.isort]
+line_length = 88
+profile = "black"
+skip_gitignore = true

pyscroll/data.py

@@ -20,8 +20,8 @@
 except ImportError:
     pass
 
-from .common import rect_to_bb, RectLike, Vector2DInt
 from .animation import AnimationFrame, AnimationToken
+from .common import RectLike, Vector2DInt, rect_to_bb
 
 __all__ = (
     "PyscrollDataAdapter",

pyscroll/isometric.py

@@ -37,6 +37,7 @@ def _initialize_buffers(self, view_size):
         :return: None
         """
         import math
+
         from pygame import Rect
 
         tw, th = self.data.tile_size

pyscroll/orthographic.py

@@ -4,17 +4,12 @@
 import math
 import time
 from itertools import chain, product
-from typing import List, TYPE_CHECKING, Callable
+from typing import TYPE_CHECKING, Callable, List
 
 import pygame
 from pygame import Rect, Surface
 
-from .common import (
-    surface_clipping_context,
-    RectLike,
-    Vector2D,
-    Vector2DInt,
-)
+from .common import RectLike, Vector2D, Vector2DInt, surface_clipping_context
 from .quadtree import FastQuadTree
 
 if TYPE_CHECKING:

pyscroll/quadtree.py

@@ -6,7 +6,7 @@
 from __future__ import annotations
 
 import itertools
-from typing import TYPE_CHECKING, Tuple, Set, Sequence
+from typing import TYPE_CHECKING, Sequence, Set, Tuple
 
 from pygame import Rect
 

setup.py

@@ -5,29 +5,4 @@
 # python3 -m twine upload --repository pypi dist/*
 from setuptools import setup
 
-setup(
-    name="pyscroll",
-    version="2.31",
-    description="Fast scrolling maps library for pygame",
-    author="bitcraft",
-    author_email="[email protected]",
-    url="https://github.com/bitcraft/pyscroll",
-    packages=["pyscroll"],
-    license="LGPLv3",
-    long_description="see readme.md",
-    package_data={"pyscroll": ["license.txt", "readme.md"]},
-    classifiers=[
-        "Intended Audience :: Developers",
-        "Development Status :: 5 - Production/Stable",
-        "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
-        "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
-        "Topic :: Games/Entertainment",
-        "Topic :: Multimedia :: Graphics",
-        "Topic :: Software Development :: Libraries :: pygame",
-    ],
-)
+setup()

tests/pyscroll/test_pyscroll.py

@@ -1,8 +1,10 @@
-from unittest import mock
 import unittest
+from unittest import mock
+
 import pygame
-from pyscroll.orthographic import BufferedRenderer
+
 from pyscroll.data import PyscrollDataAdapter
+from pyscroll.orthographic import BufferedRenderer
 
 
 class DummyDataAdapter(PyscrollDataAdapter):