Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reup lint+format - rename CI env #77

Merged
merged 4 commits into from
Aug 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
strategy:
matrix:
os: ['ubuntu-latest']
environment-file: [ci/312.yaml]
environment-file: [ci/312-latest.yaml]
experimental: [false]
defaults:
run:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 2 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 1 addition & 3 deletions inequality/theil.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
"""Theil Inequality metrics

"""
"""Theil Inequality metrics"""

__author__ = "Sergio J. Rey <[email protected]> "

Expand Down
4 changes: 0 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ Repository = "https://github.com/pysal/inequality"

[project.optional-dependencies]
dev = [
"black",
"pre-commit",
"ruff",
]
Expand All @@ -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"]
Expand Down