chore: use ruff (#446)

.pre-commit-config.yaml

@@ -34,20 +34,6 @@ repos:
   hooks:
   - id: isort
 
-- repo: https://github.com/psf/black
-  rev: 22.10.0
-  hooks:
-  - id: black
-    language_version: python3
-    exclude: ^templates/
-
-## If like to embrace black styles even in the docs:
-# - repo: https://github.com/asottile/blacken-docs
-#   rev: v1.9.1
-#   hooks:
-#   - id: blacken-docs
-#     additional_dependencies: [black]
-
 - repo: https://github.com/PyCQA/flake8
   rev: 3.9.2
   hooks:
@@ -77,12 +63,14 @@ repos:
 #  hooks:
 #  - id: reorder-python-imports
 #    args: [--application-directories=.:src]
+
 - repo: https://github.com/hadialqattan/pycln
   rev: v2.1.2
   hooks:
   - id: pycln
     args: [--config=pyproject.toml]
     exclude: ^templates/
+
 - repo: local
   hooks:
   - id: pylint
@@ -92,9 +80,17 @@ repos:
     types: [python]
     exclude: ^templates/
     args: [--disable=use-implicit-booleaness-not-comparison]
+
 - repo: https://github.com/asottile/pyupgrade
   rev: v3.10.1
   hooks:
     - id: pyupgrade
       args:
         - --py38-plus
+
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  rev: v0.3.7
+  hooks:
+    - id: ruff
+      args: [ --fix ]
+    - id: ruff-format

examples/csvfile.py

@@ -1,6 +1,7 @@
 """
 A simple example showing the CSV adapter.
 """
+
 from shillelagh.backends.apsw.db import connect
 
 if __name__ == "__main__":

examples/dataframe.py

@@ -1,6 +1,7 @@
 """
 A simple example showing the Pandas adapter.
 """
+
 import pandas as pd
 
 from shillelagh.backends.apsw.db import connect

examples/datasette.py

@@ -1,6 +1,7 @@
 """
 A simple example showing the Datasette adapter.
 """
+
 from shillelagh.backends.apsw.db import connect
 
 if __name__ == "__main__":

examples/generic_xml.py

@@ -1,6 +1,7 @@
 """
 A simple example showing the generic XML.
 """
+
 import sys
 
 from shillelagh.backends.apsw.db import connect

examples/github.py

@@ -1,6 +1,7 @@
 """
 A simple example showing the GitHub adapter.
 """
+
 from shillelagh.backends.apsw.db import connect
 
 if __name__ == "__main__":

examples/gsheets.py

@@ -1,6 +1,7 @@
 """
 A simple example showing the GSheets adapter.
 """
+
 from shillelagh.backends.apsw.db import connect
 
 if __name__ == "__main__":

examples/socrata.py

@@ -1,6 +1,7 @@
 """
 A simple example showing the Socrata adapter.
 """
+
 from shillelagh.backends.apsw.db import connect
 
 if __name__ == "__main__":

examples/weatherapi.py

@@ -1,6 +1,7 @@
 """
 A simple example showing the WeatherAPI adapter.
 """
+
 import os
 import sys
 from datetime import datetime, timedelta

pyproject.toml

@@ -9,3 +9,8 @@ version_scheme = "no-guess-dev"
 
 [tool.flake8]
 max-line-length = 90
+
+[tool.ruff]
+exclude = [
+    "templates",
+]

requirements/base.txt

@@ -19,16 +19,12 @@ certifi==2022.6.15
     # via requests
 charset-normalizer==2.1.0
     # via requests
-exceptiongroup==1.1.3
-    # via cattrs
 greenlet==2.0.2
     # via
     #   shillelagh
     #   sqlalchemy
 idna==3.3
     # via requests
-importlib-metadata==6.7.0
-    # via shillelagh
 packaging==23.0
     # via shillelagh
 platformdirs==3.11.0
@@ -48,14 +44,10 @@ six==1.16.0
 sqlalchemy==1.4.39
     # via shillelagh
 typing-extensions==4.3.0
-    # via
-    #   cattrs
-    #   shillelagh
+    # via shillelagh
 url-normalize==1.4.3
     # via requests-cache
 urllib3==1.26.10
     # via
     #   requests
     #   requests-cache
-zipp==3.15.0
-    # via importlib-metadata

requirements/test.txt

@@ -39,7 +39,9 @@ cfgv==3.3.1
 charset-normalizer==2.1.0
     # via requests
 click==8.1.3
-    # via pip-tools
+    # via
+    #   pip-compile-multi
+    #   pip-tools
 codespell==2.1.0
     # via shillelagh
 coverage[toml]==6.4.2
@@ -52,10 +54,6 @@ dill==0.3.6
     #   shillelagh
 distlib==0.3.5
     # via virtualenv
-exceptiongroup==1.0.4
-    # via
-    #   cattrs
-    #   pytest
 filelock==3.7.1
     # via virtualenv
 freezegun==1.2.1
@@ -76,8 +74,6 @@ idna==3.3
     # via
     #   requests
     #   yarl
-importlib-metadata==6.7.0
-    # via shillelagh
 iniconfig==1.1.1
     # via pytest
 isort==5.10.1
@@ -105,8 +101,12 @@ pandas==1.4.3
     # via shillelagh
 pep517==0.12.0
     # via build
-pip-tools==6.8.0
+pip-compile-multi==2.6.3
     # via shillelagh
+pip-tools==6.8.0
+    # via
+    #   pip-compile-multi
+    #   shillelagh
 platformdirs==2.5.2
     # via
     #   pylint
@@ -173,6 +173,8 @@ requests-mock==1.9.3
     # via shillelagh
 rsa==4.9
     # via google-auth
+ruff==0.3.7
+    # via shillelagh
 s3transfer==0.6.0
     # via boto3
 six==1.16.0
@@ -193,18 +195,13 @@ tabulate==0.8.9
 toml==0.10.2
     # via pre-commit
 tomli==2.0.1
-    # via
-    #   build
-    #   coverage
-    #   pylint
-    #   pytest
+    # via pep517
 tomlkit==0.11.1
     # via pylint
+toposort==1.10
+    # via pip-compile-multi
 typing-extensions==4.3.0
-    # via
-    #   astroid
-    #   pylint
-    #   shillelagh
+    # via shillelagh
 url-normalize==1.4.3
     # via requests-cache
 urllib3==1.26.10
@@ -224,8 +221,6 @@ wrapt==1.14.1
     # via astroid
 yarl==1.8.1
     # via shillelagh
-zipp==3.15.0
-    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

setup.cfg

@@ -83,6 +83,7 @@ testing =
     pandas>=1.2.2
     pip-tools>=6.4.0
     pre-commit>=2.13.0
+    pip-compile-multi>=2.6.3
     prison>=0.2.1
     prompt_toolkit>=3
     psutil>=5.8.0
@@ -95,6 +96,7 @@ testing =
     pytest>=7.2.0
     python-jsonpath>=0.10.3
     requests-mock>=1.8.0
+    ruff>=0.3.7
     tabulate>=0.8.9
     yarl>=1.8.1
 all =

setup.py

@@ -1,6 +1,7 @@
 """
 Skeleton ``setup.py``, reads configuration from ``setup.cfg``.
 """
+
 import sys
 
 from pkg_resources import VersionConflict, require

src/shillelagh/adapters/api/datasette.py

@@ -89,7 +89,6 @@ def get_field(value: Any) -> Field:
 
 
 class DatasetteAPI(Adapter):
-
     """
     An adapter to Datasette instances (https://datasette.io/).
     """

src/shillelagh/adapters/api/generic_json.py

@@ -28,7 +28,6 @@
 
 
 class GenericJSONAPI(Adapter):
-
     """
     An adapter for fetching JSON data.
     """

src/shillelagh/adapters/api/generic_xml.py

@@ -42,7 +42,6 @@ def element_to_dict(element: ET.Element) -> Any:
 
 
 class GenericXMLAPI(GenericJSONAPI):
-
     """
     An adapter for fetching XML data.
     """

src/shillelagh/adapters/api/github.py

@@ -1,6 +1,7 @@
 """
 An adapter for GitHub.
 """
+
 import json
 import logging
 import urllib.parse
@@ -101,7 +102,6 @@ class Column:
 
 
 class GitHubAPI(Adapter):
-
     """
     An adapter for GitHub.
     """

src/shillelagh/adapters/api/gsheets/adapter.py

@@ -2,6 +2,7 @@
 """
 Google Sheets adapter.
 """
+
 import datetime
 import json
 import logging

src/shillelagh/adapters/api/gsheets/fields.py

@@ -1,6 +1,7 @@
 """
 Custom fields for the GSheets adapter.
 """
+
 import datetime
 from typing import Any, List, Optional, Type, Union
 

src/shillelagh/adapters/api/gsheets/lib.py

@@ -1,4 +1,5 @@
 """Helper functions for the GSheets adapter."""
+
 import datetime
 import itertools
 import string

src/shillelagh/adapters/api/gsheets/parsing/base.py

@@ -1,6 +1,7 @@
 """
 Token for parsing date and time.
 """
+
 import re
 from datetime import date, datetime, time, timedelta
 from typing import Any, Dict, Generic, Iterator, List, Tuple, Type, TypeVar

src/shillelagh/adapters/api/gsheets/parsing/number.py

@@ -3,6 +3,7 @@
 
 https://developers.google.com/sheets/api/guides/formats#number_format_tokens
 """
+
 # pylint: disable=c-extension-no-member, broad-exception-raised
 import math
 import operator

src/shillelagh/adapters/api/gsheets/types.py

@@ -1,4 +1,5 @@
 """Types for the GSheets adapter."""
+
 from enum import Enum
 
 

src/shillelagh/adapters/api/gsheets/typing.py

@@ -1,4 +1,5 @@
 """Custom types for the GSheets adapter."""
+
 from typing import Any, List
 
 from typing_extensions import Literal, TypedDict

src/shillelagh/adapters/api/html_table.py

@@ -21,7 +21,6 @@
 
 
 class HTMLTableAPI(Adapter):
-
     """
     An adapter for scraping HTML tables.
     """