modernize project

Author: skshetry

.github/workflows/build.yml

@@ -26,9 +26,9 @@ jobs:
     - uses: actions/setup-python@v5
       with:
         python-version: 3.8
-    - run: python -m pip install --upgrade build twine
-    - run: python -m build
-    - run: twine check --strict dist/*
+    - uses: astral-sh/setup-uv@v6
+    - run: uv build
+    - run: uv tool run twine check --strict dist/*
     - uses: actions/upload-artifact@v4
       with:
         name: Packages

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ permissions:
   contents: read
 
 jobs:
-  pre-commit:
+  tests:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -25,6 +25,7 @@ jobs:
     - uses: actions/setup-python@v5
       with:
         python-version: "3.8"
-    - uses: pre-commit/[email protected]
-    - run: pip install -e ".[tests]"
+    - uses: astral-sh/setup-uv@v6
+    - uses: pre-commit/[email protected]
+    - run: uv pip install . --group tests
     - run: pytest

.pre-commit-config.yaml

@@ -1,17 +1,17 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: 'v0.1.9'
+  rev: 'v0.12.1'
   hooks:
   - id: ruff
     args: [--fix, --exit-non-zero-on-fix]
   - id: ruff-format
 - repo: https://github.com/codespell-project/codespell
-  rev: v2.2.6
+  rev: v2.4.1
   hooks:
   - id: codespell
     additional_dependencies: ["tomli"]
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: 'v1.8.0'
+  rev: 'v1.16.1'
   hooks:
   - id: mypy
-    exclude: '^tests/'
+    additional_dependencies: ["pytest", "hypothesis"]

bscal.py

@@ -317,7 +317,9 @@ def ad_to_bs(ad: date, start: Optional[int] = None) -> Tuple[int, int, int]:
 
 
 class BSCalendar(calendar.TextCalendar):
-    def __init__(self, firstweekday: int = 0, to_highlight: Tuple[int, ...] = ()):
+    def __init__(
+        self, firstweekday: int = 0, to_highlight: Tuple[int, ...] = ()
+    ) -> None:
         super().__init__(firstweekday)
         self._to_highlight = to_highlight
         self._formatting_ctx: Tuple[int, ...] = ()
@@ -356,7 +358,8 @@ def formatday(self, day: int, weekday: int, width: int) -> str:
 
 
 def bsconv(bs_datestring: str) -> None:
-    ad = bs_to_ad(*map(int, bs_datestring.split("-")[:3]))
+    year, month, day, *_ = map(int, bs_datestring.split("-"))
+    ad = bs_to_ad(year, month, day)
     ad_tz = datetime.combine(ad, datetime.now().time()).astimezone()
     print(ad_tz.strftime("%a %b %e %T %Z %Y"))
 

pyproject.toml

@@ -15,35 +15,43 @@ dynamic = ["version"]
 bscal = "bscal:cal"
 bsdate = "bscal:bsdate"
 
-[project.optional-dependencies]
+[dependency-groups]
 tests = ["pytest", "hypothesis"]
-
-[tool.setuptools]
-license-files = ["LICENSE"]
+dev = [{ include-group = 'tests' }]
 
 [tool.setuptools_scm]
 
 [tool.mypy]
 check_untyped_defs = true
-files = ["bscal.py"]
+files = ["bscal.py", "tests"]
 strict = true
 
 [tool.ruff]
-ignore = ["ISC001", "S101"]
-select = [
-    "F", "E", "W", "C90", "I", "N", "UP", "YTT", "ASYNC", "S", "BLE", "B", "A", "C4", "T10",
-    "EXE", "ISC", "ICN", "G", "INP", "PIE", "PYI", "PT", "Q", "RSE", "RET",
-    "SLOT", "SIM", "TID", "TCH", "ARG", "PGH", "PLC", "PLE", "PLR", "PLW", "TRY",
-    "FLY", "PERF101", "RUF",
-]
-show-source = true
+output-format = "full"
 show-fixes = true
 
+[tool.ruff.lint]
+ignore = [
+    "ISC001",
+    "S101",
+    "PLC0415",
+    "D1",
+    "FA",
+    "T201",
+    "EM",
+    "FBT",
+    "ERA",
+    "D2",
+    "DTZ",
+    "COM",
+]
+select = ["ALL"]
+
 [tool.ruff.format]
 preview = true
 
-[tool.ruff.flake8-type-checking]
+[tool.ruff.lint.flake8-type-checking]
 strict = true
 
-[tool.ruff.flake8-unused-arguments]
+[tool.ruff.lint.flake8-unused-arguments]
 ignore-variadic-names = true

tests/test_cli.py

@@ -60,7 +60,11 @@
         (("2080",), results_2080),
     ],
 )
-def test_cli(capsys, args, expected):
+def test_cli(
+    capsys: pytest.CaptureFixture[str],
+    args: tuple[str, str],
+    expected: str,
+) -> None:
     cal(args)
     out, err = capsys.readouterr()
     assert out == expected

tests/test_conversion.py

@@ -1,9 +1,12 @@
+from datetime import date
+
 from hypothesis import given
 from hypothesis.strategies import dates
 
 from bscal import ad_to_bs, bs_to_ad, new_years
 
 
 @given(dates(min(new_years.values()), max(new_years.values())))
-def test(date):
-    assert bs_to_ad(*ad_to_bs(date)) == date
+def test(date: date) -> None:
+    bs_year, bs_month, bs_day = ad_to_bs(date)
+    assert bs_to_ad(bs_year, bs_month, bs_day) == date