Clean up minor formatting issues.

HexDecimal · HexDecimal · commit 5a1d70cab1bf · 2023-05-24T23:22:04.000-07:00
Don't try to force import order in examples to look like external projects.

Remove shebangs from test scripts.

Add +x to examples and scripts.

Fix all whitespace and final newlines.
diff --git a/.editorconfig b/.editorconfig
@@ -26,4 +26,3 @@ indent_size = 2
 [*.json]
 indent_style = space
 indent_size = 4
-insert_final_newline = false
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -35,12 +35,7 @@ jobs:
         uses: liskin/gh-problem-matcher-wrap@v2
         with:
           linters: isort
-          run: isort scripts/ tcod/ tests/ --check --diff
-      - name: isort (examples)
-        uses: liskin/gh-problem-matcher-wrap@v2
-        with:
-          linters: isort
-          run: isort examples/ --check --diff --thirdparty tcod
+          run: isort scripts/ tcod/ tests/ examples/ --check --diff
 
   flake8:
     runs-on: ubuntu-latest
diff --git a/.pyup.yml b/.pyup.yml
@@ -1,4 +1,4 @@
-# autogenerated pyup.io config file 
+# autogenerated pyup.io config file
 # see https://pyup.io/docs/configuration/ for all available options
 
 update: false
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -16,4 +16,4 @@
     ],
     // List of extensions recommended by VS Code that should not be recommended for users of this workspace.
     "unwantedRecommendations": []
-}
+}
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -45,4 +45,4 @@
             "preLaunchTask": "build documentation",
         }
     ]
-}
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -7,6 +7,9 @@
     "editor.codeActionsOnSave": {
         "source.organizeImports": true
     },
+    "files.trimFinalNewlines": true,
+    "files.insertFinalNewline": true,
+    "files.trimTrailingWhitespace": true,
     "python.linting.enabled": true,
     "python.linting.flake8Enabled": true,
     "python.linting.mypyEnabled": true,
@@ -432,4 +435,4 @@
     "cSpell.enableFiletypes": [
         "github-actions-workflow"
     ]
-}
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -41,4 +41,4 @@
             }
         }
     ]
-}
+}
diff --git a/build_libtcod.py b/build_libtcod.py
diff --git a/build_sdl.py b/build_sdl.py
diff --git a/docs/index.rst b/docs/index.rst
@@ -51,4 +51,3 @@ Indices and tables
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
-
diff --git a/examples/.isort.cfg b/examples/.isort.cfg
diff --git a/examples/cavegen.py b/examples/cavegen.py
diff --git a/examples/framerate.py b/examples/framerate.py
diff --git a/examples/samples_libtcodpy.py b/examples/samples_libtcodpy.py
@@ -4,6 +4,7 @@
 # This code demonstrates various usages of libtcod modules
 # It's in the public domain.
 #
+# ruff: noqa
 from __future__ import division
 
 import math
diff --git a/examples/samples_tcod.py b/examples/samples_tcod.py
@@ -15,10 +15,11 @@
 from typing import Any, List
 
 import numpy as np
+from numpy.typing import NDArray
+
 import tcod
 import tcod.render
 import tcod.sdl.render
-from numpy.typing import NDArray
 
 if not sys.warnoptions:
     warnings.simplefilter("default")  # Show all warnings.
diff --git a/examples/sdl-hello-world.py b/examples/sdl-hello-world.py
@@ -2,10 +2,11 @@
 from pathlib import Path
 
 import numpy as np
+from PIL import Image, ImageDraw, ImageFont  # type: ignore  # pip install Pillow
+
 import tcod
 import tcod.sdl.render
 import tcod.sdl.video
-from PIL import Image, ImageDraw, ImageFont  # type: ignore  # pip install Pillow
 
 CURRENT_DIR = Path(__file__).parent  # Directory of this script.
 font = ImageFont.truetype(bytes(CURRENT_DIR / "DejaVuSerif.ttf"), size=18)  # Preloaded font file.
diff --git a/examples/ttf.py b/examples/ttf.py
@@ -12,9 +12,10 @@
 
 import freetype  # type: ignore  # pip install freetype-py
 import numpy as np
-import tcod
 from numpy.typing import NDArray
 
+import tcod
+
 FONT = "VeraMono.ttf"
 
 
diff --git a/fonts/libtcod/README.txt b/fonts/libtcod/README.txt
@@ -1,5 +1,5 @@
 This directory contains antialiased fonts for libtcod.
-These fonts are in public domain. 
+These fonts are in public domain.
 
 The file names are composed with :
 <font_name><font_size>_<type>_<layout>.png
diff --git a/scripts/tag_release.py b/scripts/tag_release.py
diff --git a/tests/test_libtcodpy.py b/tests/test_libtcodpy.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 from typing import Any, Callable, Iterator, List, Optional, Tuple, Union
 
 import numpy
diff --git a/tests/test_parser.py b/tests/test_parser.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import os
 from typing import Any
 
diff --git a/tests/test_tcod.py b/tests/test_tcod.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import copy
 import pickle
 from typing import Any, NoReturn
diff --git a/tests/test_testing.py b/tests/test_testing.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import os
 
 curdir = os.path.dirname(__file__)

Original file line number	Diff line number	Diff line change
`@@ -45,4 +45,4 @@`
`45`	`45`	`"preLaunchTask": "build documentation",`
`46`	`46`	`}`
`47`	`47`	`]`
`48`		`-}`
	`48`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -41,4 +41,4 @@`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`]`
`44`		`-}`
	`44`	`+}`