feat: Run Black via pre-commit

- Remove the need for the `scripts/format` file
- Format two previously not included files

Author: l0b0

.github/pull_request_template.md

@@ -6,7 +6,7 @@
 
 **PR Checklist:**
 
-- [ ] Code is formatted (run `scripts/format`)
+- [ ] Code is formatted (run `pre-commit run --all-files`)
 - [ ] Tests pass (run `scripts/test`)
 - [ ] This PR maintains or improves overall codebase code coverage.
 - [ ] Changes are added to the [CHANGELOG](https://github.com/stac-utils/pystac/blob/develop/CHANGELOG.md). See [the docs](https://pystac.readthedocs.io/en/latest/contributing.html#changelog) for information about adding to the changelog.

.pre-commit-config.yaml

@@ -0,0 +1,12 @@
+# Configuration file for pre-commit (https://pre-commit.com/).
+# Please run `pre-commit run --all-files` when adding or changing entries.
+
+repos:
+  - repo: local
+    hooks:
+      - id: black
+        name: black
+        entry: black
+        language: system
+        stages: [commit]
+        types: [python]

docs/conf.py

@@ -17,22 +17,21 @@
 import subprocess
 from typing import Any, Dict
 
-sys.path.insert(0, os.path.abspath('.'))
-sys.path.insert(0, os.path.abspath('../'))
+sys.path.insert(0, os.path.abspath("."))
+sys.path.insert(0, os.path.abspath("../"))
 from pystac.version import __version__, STACVersion
 
-git_branch = subprocess.check_output(['git',
-                                      'rev-parse',
-                                      '--abbrev-ref',
-                                      'HEAD']) \
-                       .decode("utf-8") \
-                       .strip()
+git_branch = (
+    subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"])
+    .decode("utf-8")
+    .strip()
+)
 
 # -- Project information -----------------------------------------------------
 
-project = 'pystac'
-copyright = '2019, Azavea'
-author = 'stac-utils'
+project = "pystac"
+copyright = "2019, Azavea"
+author = "stac-utils"
 
 # The short X.Y version
 version = __version__
@@ -50,35 +49,41 @@
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'sphinx.ext.autodoc',
-    'sphinx.ext.viewcode',
-    'sphinx.ext.intersphinx',
-    'sphinx.ext.napoleon',
-    'sphinx.ext.githubpages',
-    'sphinx.ext.extlinks',
-    'sphinxcontrib.fulltoc',
-    'nbsphinx'
+    "sphinx.ext.autodoc",
+    "sphinx.ext.viewcode",
+    "sphinx.ext.intersphinx",
+    "sphinx.ext.napoleon",
+    "sphinx.ext.githubpages",
+    "sphinx.ext.extlinks",
+    "sphinxcontrib.fulltoc",
+    "nbsphinx",
 ]
 
 extlinks = {
-    'tutorial': ('https://github.com/stac-utils/pystac/'
-                  'tree/{}/docs/tutorials/%s'.format(git_branch), 'tutorial'),
-    'stac-spec': ('https://github.com/radiantearth/stac-spec/tree/'
-                  'v{}/%s'.format(STACVersion.DEFAULT_STAC_VERSION), 'path'),
-    'stac-ext': ('https://github.com/stac-extensions/%s', '%s extension')
+    "tutorial": (
+        "https://github.com/stac-utils/pystac/"
+        "tree/{}/docs/tutorials/%s".format(git_branch),
+        "tutorial",
+    ),
+    "stac-spec": (
+        "https://github.com/radiantearth/stac-spec/tree/"
+        "v{}/%s".format(STACVersion.DEFAULT_STAC_VERSION),
+        "path",
+    ),
+    "stac-ext": ("https://github.com/stac-extensions/%s", "%s extension"),
 }
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -90,7 +95,7 @@
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path.
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', '**.ipynb_checkpoints']
+exclude_patterns = ["_build", "Thumbs.db", ".DS_Store", "**.ipynb_checkpoints"]
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = None
@@ -101,7 +106,7 @@
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'alabaster'
+html_theme = "alabaster"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -119,7 +124,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']
+# html_static_path = ['_static']
 
 # Custom sidebar templates, must be a dictionary that maps document names
 # to template names.
@@ -135,7 +140,7 @@
 # -- Options for HTMLHelp output ---------------------------------------------
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'pystacdoc'
+htmlhelp_basename = "pystacdoc"
 
 
 # -- Options for LaTeX output ------------------------------------------------
@@ -144,15 +149,12 @@
     # The paper size ('letterpaper' or 'a4paper').
     #
     # 'papersize': 'letterpaper',
-
     # The font size ('10pt', '11pt' or '12pt').
     #
     # 'pointsize': '10pt',
-
     # Additional stuff for the LaTeX preamble.
     #
     # 'preamble': '',
-
     # Latex figure (float) alignment
     #
     # 'figure_align': 'htbp',
@@ -162,19 +164,15 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'pystac.tex', 'pystac Documentation',
-     'stac-utils', 'manual'),
+    (master_doc, "pystac.tex", "pystac Documentation", "stac-utils", "manual"),
 ]
 
 
 # -- Options for manual page output ------------------------------------------
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [
-    (master_doc, 'pystac', 'pystac Documentation',
-     [author], 1)
-]
+man_pages = [(master_doc, "pystac", "pystac Documentation", [author], 1)]
 
 
 # -- Options for Texinfo output ----------------------------------------------
@@ -183,9 +181,15 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'pystac', 'pystac Documentation',
-     author, 'pystac', 'Python library for SpatioTemporal Asset Catalogs (STAC).',
-     'Miscellaneous'),
+    (
+        master_doc,
+        "pystac",
+        "pystac Documentation",
+        author,
+        "pystac",
+        "Python library for SpatioTemporal Asset Catalogs (STAC).",
+        "Miscellaneous",
+    ),
 ]
 
 
@@ -204,11 +208,11 @@
 # epub_uid = ''
 
 # A list of files that should not be packed into the epub file.
-epub_exclude_files = ['search.html']
+epub_exclude_files = ["search.html"]
 
 
 # -- Extension configuration -------------------------------------------------
 
 intersphinx_mapping = {
-    'python': ('https://docs.python.org/3', None),
+    "python": ("https://docs.python.org/3", None),
 }

docs/contributing.rst

@@ -58,7 +58,7 @@ To format code:
 
 .. code-block:: bash
 
-    > ./scripts/format
+    > pre-commit run --all-files
 
 We also use `doc8 <https://github.com/pycqa/doc8>`__ for style checking on RST files in
 the docs.

requirements-test.txt

@@ -11,5 +11,7 @@ doc8==0.8.1
 types-python-dateutil==0.1.3
 types-orjson==0.1.0
 
+pre-commit==2.13.0
+
 # optional dependencies
 orjson==3.5.3

scripts/format

@@ -18,9 +18,7 @@ echo
 echo " -- CHECKING FORMAT WITH BLACK --"
 echo
 
-black --check pystac
-black --check tests
-black --check setup.py
+pre-commit run --all-files
 
 echo
 echo " -- CHECKING SPELLING WITH CODESPELL --"