diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml index 16d92b3..3a9b84f 100644 --- a/.github/workflows/build_docs.yml +++ b/.github/workflows/build_docs.yml @@ -20,7 +20,7 @@ strategy: matrix: os: ['ubuntu-latest'] - environment-file: [ci/312.yaml] + environment-file: [ci/312-latest.yaml] experimental: [false] defaults: run: diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 6c29e65..0507610 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -25,16 +25,16 @@ matrix: os: [ubuntu-latest] environment-file: - - ci/310-MIN.yaml - - ci/311.yaml - - ci/312.yaml - - ci/312-DEV.yaml + - ci/310-oldest.yaml + - ci/311-latest.yaml + - ci/312-latest.yaml + - ci/312-dev.yaml include: - - environment-file: ci/312.yaml + - environment-file: ci/312-latest.yaml os: macos-13 # Intel - - environment-file: ci/312.yaml + - environment-file: ci/312-latest.yaml os: macos-14 # Apple Silicon - - environment-file: ci/312.yaml + - environment-file: ci/312-latest.yaml os: windows-latest fail-fast: false diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f4cd8ad..d16e920 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,14 +1,10 @@ files: "inequality\/" repos: - - repo: https://github.com/psf/black - rev: "24.4.2" - hooks: - - id: black - language_version: python3 - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.5.0" + rev: "v0.6.1" hooks: - id: ruff + - id: ruff-format ci: autofix_prs: false diff --git a/ci/310-MIN.yaml b/ci/310-oldest.yaml similarity index 100% rename from ci/310-MIN.yaml rename to ci/310-oldest.yaml diff --git a/ci/311.yaml b/ci/311-latest.yaml similarity index 100% rename from ci/311.yaml rename to ci/311-latest.yaml diff --git a/ci/312-DEV.yaml b/ci/312-dev.yaml similarity index 100% rename from ci/312-DEV.yaml rename to ci/312-dev.yaml diff --git a/ci/312.yaml b/ci/312-latest.yaml similarity index 100% rename from ci/312.yaml rename to ci/312-latest.yaml diff --git a/inequality/theil.py b/inequality/theil.py index 458c6d9..7d9b629 100644 --- a/inequality/theil.py +++ b/inequality/theil.py @@ -1,6 +1,4 @@ -"""Theil Inequality metrics - -""" +"""Theil Inequality metrics""" __author__ = "Sergio J. Rey " diff --git a/pyproject.toml b/pyproject.toml index 60b946b..4a4aff7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,7 +37,6 @@ Repository = "https://github.com/pysal/inequality" [project.optional-dependencies] dev = [ - "black", "pre-commit", "ruff", ] @@ -62,12 +61,9 @@ pen = [ [tool.setuptools.packages.find] include = ["inequality", "inequality.*"] -[tool.black] -line-length = 88 [tool.ruff] line-length = 88 -target-version = "py310" [tool.ruff.lint] select = ["E", "F", "W", "I", "UP", "N", "B", "A", "C4", "SIM", "ARG"]