From 660a7d5fc7fdaf573fb39390bccb1620cb103d6a Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Wed, 21 Aug 2024 19:06:20 -0400 Subject: [PATCH 1/4] reup lint+format - rename CI env --- .github/workflows/build_docs.yml | 2 +- .github/workflows/testing.yml | 14 +++++++------- .pre-commit-config.yaml | 8 ++------ ci/{310-MIN.yaml => 310-oldest.yaml} | 0 ci/{311.yaml => 311-latest.yaml} | 0 ci/{312.yaml => 312_latest.yaml} | 0 inequality/theil.py | 4 +--- pyproject.toml | 4 ---- 8 files changed, 11 insertions(+), 21 deletions(-) rename ci/{310-MIN.yaml => 310-oldest.yaml} (100%) rename ci/{311.yaml => 311-latest.yaml} (100%) rename ci/{312.yaml => 312_latest.yaml} (100%) diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml index 16d92b33..3a9b84ff 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 6c29e653..0507610f 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 f4cd8ad8..d16e9205 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.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 458c6d94..7d9b6294 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 60b946bc..4a4aff79 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"] From 09349161978de6f06d6d59de21f44aa87fab20f0 Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Wed, 21 Aug 2024 19:11:43 -0400 Subject: [PATCH 2/4] correct env name format --- ci/{312_latest.yaml => 312-latest.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ci/{312_latest.yaml => 312-latest.yaml} (100%) diff --git a/ci/312_latest.yaml b/ci/312-latest.yaml similarity index 100% rename from ci/312_latest.yaml rename to ci/312-latest.yaml From 94a169cbdd965851c32222e181f5f3f8ef5bfc12 Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Wed, 21 Aug 2024 19:26:02 -0400 Subject: [PATCH 3/4] temp rename to trigger recognition of caps vs. lower --- .github/workflows/testing.yml | 2 +- ci/{312-DEV.yaml => 312-dev__.yaml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename ci/{312-DEV.yaml => 312-dev__.yaml} (100%) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 0507610f..4bb26bda 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -28,7 +28,7 @@ - ci/310-oldest.yaml - ci/311-latest.yaml - ci/312-latest.yaml - - ci/312-dev.yaml + - ci/312-dev__.yaml include: - environment-file: ci/312-latest.yaml os: macos-13 # Intel 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 From 79ca5ac2fd4e9370d61da09a34f4af6014e18f28 Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Wed, 21 Aug 2024 19:38:41 -0400 Subject: [PATCH 4/4] swap back naming conventions --- .github/workflows/testing.yml | 2 +- ci/{312-dev__.yaml => 312-dev.yaml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename ci/{312-dev__.yaml => 312-dev.yaml} (100%) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 4bb26bda..0507610f 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -28,7 +28,7 @@ - ci/310-oldest.yaml - ci/311-latest.yaml - ci/312-latest.yaml - - ci/312-dev__.yaml + - ci/312-dev.yaml include: - environment-file: ci/312-latest.yaml os: macos-13 # Intel 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