Merge branch 'master' into koo-macro

Author: Secrus

.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@v3
@@ -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: |
@@ -46,7 +46,7 @@ jobs:
           python -c 'import pendulum._pendulum'
 
       - name: Run benchmarks
-        uses: CodSpeedHQ/action@v1
+        uses: CodSpeedHQ/action@v3
         with:
           token: ${{ secrets.CODSPEED_TOKEN }}
           run: pytest tests/ --codspeed

.github/workflows/release.yml

@@ -128,7 +128,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,19 +50,11 @@ 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: |
-          curl -fsS https://install.python-poetry.org | python - --preview -y
-
-      - name: Update PATH
-        if: ${{ matrix.os != 'Windows' }}
-        run: echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-      - name: Update Path for Windows
-        if: ${{ matrix.os == 'Windows' }}
-        run: echo "$APPDATA\Python\Scripts" >> $GITHUB_PATH
+          pipx install poetry>=2
 
       - name: Configure poetry
         run: poetry config virtualenvs.in-project true
@@ -90,7 +82,7 @@ jobs:
 
       - name: Uninstall typing dependencies
         # This ensures pendulum runs without typing_extensions installed
-        run: poetry install --only main --only test --only build --sync --no-root -vvv
+        run: poetry sync --only main --only test --only build --no-root -vvv
 
       - name: Test Pure Python
         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

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

poetry.lock

@@ -7,7 +7,6 @@ requires-python = ">=3.9"
 license = { text = "MIT License" }
 authors = [{ name = "Sébastien Eustace", email = "[email protected]" }]
 keywords = ['datetime', 'date', 'time']
-
 classifiers = [
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3",
@@ -20,6 +19,10 @@ classifiers = [
 dependencies = [
     "python-dateutil>=2.6",
     "tzdata>=2020.1",
+]
+
+[project.optional-dependencies]
+test = [
     'time-machine>=2.6.0; implementation_name != "pypy"',
 ]
 
@@ -29,25 +32,6 @@ Documentation = "https://pendulum.eustace.io/docs"
 Repository = "https://github.com/sdispater/pendulum"
 
 
-[tool.poetry]
-name = "pendulum"
-version = "3.0.0"
-description = "Python datetimes made easy"
-authors = ["Sébastien Eustace <[email protected]>"]
-license = "MIT"
-readme = 'README.rst'
-homepage = "https://pendulum.eustace.io"
-repository = "https://github.com/sdispater/pendulum"
-documentation = "https://pendulum.eustace.io/docs"
-keywords = ['datetime', 'date', 'time']
-
-
-[tool.poetry.dependencies]
-python = ">=3.9"
-python-dateutil = ">=2.6"
-time-machine = { version = ">=2.16.0", markers = "implementation_name != 'pypy'", optional = true }
-tzdata = ">=2020.1"
-
 [tool.poetry.group.test.dependencies]
 pytest = "^7.1.2"
 pytz = ">=2022.1"
@@ -79,53 +63,55 @@ pytest-codspeed = "^3.0.0"
 [tool.poetry.group.build.dependencies]
 maturin = ">=1.0,<2.0"
 
-[tool.poetry.extras]
-test = ["time-machine"]
-
 [tool.maturin]
 module-name = "pendulum._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
@@ -139,7 +125,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"]
 

pyproject.toml

@@ -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/helpers.rs

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

rust/src/python/parsing.rs

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