Merge branch 'master' into enables-python-3.13

Author: rudolfix

.github/workflows/codspeed.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   benchmarks:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -21,7 +21,7 @@ jobs:
       - name: Get full Python version
         id: full-python-version
         run: |
-          echo ::set-output name=version::$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))")
+          echo version=$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))") >> $GITHUB_OUTPUT
 
       - name: Install poetry
         run: |

.github/workflows/release.yml

@@ -143,7 +143,7 @@ jobs:
         id: check-version
         run: |
           [[ "${GITHUB_REF#refs/tags/}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] \
-            || echo ::set-output name=prerelease::true
+            || echo prerelease=true >> $GITHUB_OUTPUT
 
       - name: Create Release
         uses: ncipollo/release-action@v1

.github/workflows/tests.yml

@@ -50,7 +50,7 @@ jobs:
       - name: Get full Python version
         id: full-python-version
         run: |
-          echo ::set-output name=version::$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))")
+          echo version=$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))") >> $GITHUB_OUTPUT
 
       - name: Install poetry
         run: |

.pre-commit-config.yaml

@@ -11,15 +11,11 @@ repos:
         exclude: ^tests/.*/fixtures/.*
       - id: debug-statements
 
-  - repo: https://github.com/psf/black
-    rev: 23.7.0
-    hooks:
-      - id: black
-
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.0.291
+    rev: v0.11.2
     hooks:
-    -   id: ruff
+      - id: ruff
+      - id: ruff-format
 
   - repo: local
     hooks:

clock

@@ -197,7 +197,7 @@ translations = {{}}
             )
 
             s.append(f"{'    ' * tab}{k!r}: {v},\n")
-        s.append(f'{"    " * (tab - 1)}}}')
+        s.append(f"{'    ' * (tab - 1)}}}")
 
         return "".join(s)
 

pyproject.toml

@@ -71,44 +71,50 @@ python-packages = ["pendulum"]
 
 [tool.ruff]
 fix = true
-unfixable = [
-    "ERA", # do not autoremove commented out code
-]
-target-version = "py39"
 line-length = 88
+target-version = "py39"
+extend-exclude = [
+    # External to the project's coding standards:
+    "docs/*",
+    # Machine-generated, too many false-positives
+    "src/pendulum/locales/*",
+    # ruff disagrees with black when it comes to formatting
+    "*.pyi",
+]
+
+[tool.ruff.lint]
 extend-select = [
-    "B", # flake8-bugbear
-    "C4", # flake8-comprehensions
+    "B",   # flake8-bugbear
+    "C4",  # flake8-comprehensions
     "ERA", # flake8-eradicate/eradicate
-    "I", # isort
-    "N", # pep8-naming
+    "I",   # isort
+    "N",   # pep8-naming
     "PIE", # flake8-pie
     "PGH", # pygrep
     "RUF", # ruff checks
     "SIM", # flake8-simplify
+    "T20", # flake8-print
     "TCH", # flake8-type-checking
     "TID", # flake8-tidy-imports
-    "UP", # pyupgrade
+    "UP",  # pyupgrade
 ]
 ignore = [
     "B904", # use 'raise ... from err'
     "B905", # use explicit 'strict=' parameter with 'zip()'
-    "N818", #  Exception name should be named with an Error suffix
-    "RUF001",
+    "N818",
+    "RUF001"
 ]
-extend-exclude = [
-    # External to the project's coding standards:
-    "docs/*",
-    # Machine-generated, too many false-positives
-    "src/pendulum/locales/*",
-    # ruff disagrees with black when it comes to formatting
-    "*.pyi",
+extend-safe-fixes = [
+    "TCH", # move import from and to TYPE_CHECKING blocks
+]
+unfixable = [
+    "ERA", # do not autoremove commented out code
 ]
 
-[tool.ruff.flake8-tidy-imports]
+[tool.ruff.lint.flake8-tidy-imports]
 ban-relative-imports = "all"
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 force-single-line = true
 lines-between-types = 1
 lines-after-imports = 2
@@ -122,7 +128,7 @@ known-third-party = [
 ]
 required-imports = ["from __future__ import annotations"]
 
-[tool.ruff.extend-per-file-ignores]
+[tool.ruff.lint.extend-per-file-ignores]
 "build.py" = ["I002"]
 "clock" = ["RUF012"]
 

rust/src/python/helpers.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::useless_conversion)]
 use std::cmp::Ordering;
 
 use pyo3::{
@@ -123,32 +124,32 @@ pub fn get_offset(dt: &Bound<PyAny>) -> PyResult<i32> {
 }
 
 #[pyfunction]
-pub fn is_leap(year: i32) -> PyResult<bool> {
-    Ok(helpers::is_leap(year))
+pub fn is_leap(year: i32) -> bool {
+    helpers::is_leap(year)
 }
 
 #[pyfunction]
-pub fn is_long_year(year: i32) -> PyResult<bool> {
-    Ok(helpers::is_long_year(year))
+pub fn is_long_year(year: i32) -> bool {
+    helpers::is_long_year(year)
 }
 
 #[pyfunction]
-pub fn week_day(year: i32, month: u32, day: u32) -> PyResult<u32> {
-    Ok(helpers::week_day(year, month, day))
+pub fn week_day(year: i32, month: u32, day: u32) -> u32 {
+    helpers::week_day(year, month, day)
 }
 
 #[pyfunction]
-pub fn days_in_year(year: i32) -> PyResult<u32> {
-    Ok(helpers::days_in_year(year))
+pub fn days_in_year(year: i32) -> u32 {
+    helpers::days_in_year(year)
 }
 
 #[pyfunction]
 pub fn local_time(
     unix_time: f64,
     utc_offset: isize,
     microsecond: usize,
-) -> PyResult<(usize, usize, usize, usize, usize, usize, usize)> {
-    Ok(helpers::local_time(unix_time, utc_offset, microsecond))
+) -> (usize, usize, usize, usize, usize, usize, usize) {
+    helpers::local_time(unix_time, utc_offset, microsecond)
 }
 
 #[pyfunction]

rust/src/python/parsing.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::useless_conversion)]
 use pyo3::exceptions;
 use pyo3::prelude::*;
 use pyo3::types::PyDate;

rust/src/python/types/timezone.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::useless_conversion)]
 use pyo3::prelude::*;
 use pyo3::types::{PyDelta, PyDict, PyTzInfo};
 

src/pendulum/__init__.py

@@ -59,18 +59,15 @@
 
 
 @overload
-def timezone(name: int) -> FixedTimezone:
-    ...
+def timezone(name: int) -> FixedTimezone: ...
 
 
 @overload
-def timezone(name: str) -> Timezone:
-    ...
+def timezone(name: str) -> Timezone: ...
 
 
 @overload
-def timezone(name: str | int) -> Timezone | FixedTimezone:
-    ...
+def timezone(name: str | int) -> Timezone | FixedTimezone: ...
 
 
 def timezone(name: str | int) -> Timezone | FixedTimezone:
@@ -119,7 +116,7 @@ def _safe_timezone(
 
             obj = int(offset.total_seconds())
 
-    obj = cast(Union[str, int], obj)
+    obj = cast("Union[str, int]", obj)
 
     return timezone(obj)
 
@@ -205,24 +202,21 @@ def time(hour: int, minute: int = 0, second: int = 0, microsecond: int = 0) -> T
 def instance(
     obj: _datetime.datetime,
     tz: str | Timezone | FixedTimezone | _datetime.tzinfo | None = UTC,
-) -> DateTime:
-    ...
+) -> DateTime: ...
 
 
 @overload
 def instance(
     obj: _datetime.date,
     tz: str | Timezone | FixedTimezone | _datetime.tzinfo | None = UTC,
-) -> Date:
-    ...
+) -> Date: ...
 
 
 @overload
 def instance(
     obj: _datetime.time,
     tz: str | Timezone | FixedTimezone | _datetime.tzinfo | None = UTC,
-) -> Time:
-    ...
+) -> Time: ...
 
 
 def instance(
@@ -350,22 +344,27 @@ def interval(
 travel_back = _traveller.travel_back
 
 __all__ = [
-    "__version__",
     "DAYS_PER_WEEK",
     "HOURS_PER_DAY",
     "MINUTES_PER_HOUR",
     "MONTHS_PER_YEAR",
     "SECONDS_PER_DAY",
     "SECONDS_PER_HOUR",
     "SECONDS_PER_MINUTE",
+    "UTC",
     "WEEKS_PER_YEAR",
     "YEARS_PER_CENTURY",
     "YEARS_PER_DECADE",
     "Date",
     "DateTime",
     "Duration",
+    "FixedTimezone",
     "Formatter",
+    "Interval",
+    "Time",
+    "Timezone",
     "WeekDay",
+    "__version__",
     "date",
     "datetime",
     "duration",
@@ -377,18 +376,13 @@ def interval(
     "instance",
     "interval",
     "local",
+    "local_timezone",
     "locale",
     "naive",
     "now",
-    "set_locale",
-    "week_ends_at",
-    "week_starts_at",
     "parse",
-    "Interval",
-    "Time",
-    "UTC",
-    "local_timezone",
     "set_local_timezone",
+    "set_locale",
     "test_local_timezone",
     "time",
     "timezone",
@@ -398,7 +392,7 @@ def interval(
     "travel",
     "travel_back",
     "travel_to",
-    "FixedTimezone",
-    "Timezone",
+    "week_ends_at",
+    "week_starts_at",
     "yesterday",
 ]