Merge branch 'main' into main

.github/CONTRIBUTING.md

@@ -13,7 +13,8 @@ pre-commit run --all-files  # to run on all files now
 
 ## Docstrings
 
-Follow [Google style](https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings)
+Follow
+[Google style](https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings)
 for docstrings.
 
 ## Localization

.github/ISSUE_TEMPLATE.md

@@ -12,7 +12,10 @@
 
 Please include **code** that reproduces the issue.
 
-The [best reproductions](https://stackoverflow.com/help/minimal-reproducible-example) are [self-contained scripts](https://ericlippert.com/2014/03/05/how-to-debug-small-programs/) with minimal dependencies.
+The [best reproductions](https://stackoverflow.com/help/minimal-reproducible-example)
+are
+[self-contained scripts](https://ericlippert.com/2014/03/05/how-to-debug-small-programs/)
+with minimal dependencies.
 
 ```python
 code goes here

.github/SECURITY.md

@@ -1,4 +1,4 @@
 # Security policy
 
-Security reports can be made via [Tidelift](https://tidelift.com/security).
-Tidelift will coordinate the fix and disclosure.
+Security reports can be made via [Tidelift](https://tidelift.com/security). Tidelift
+will coordinate the fix and disclosure.

.github/renovate.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["config:base"],
+  "extends": ["config:base", ":semanticCommitsDisabled"],
   "labels": ["changelog: skip", "dependencies"],
   "packageRules": [
     {

.github/workflows/docs.yml

@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.x"
           cache: pip

.github/workflows/labels.yml

@@ -1,4 +1,8 @@
 name: Sync labels
+
+permissions:
+  pull-requests: write
+
 on:
   push:
     branches:
@@ -11,7 +15,7 @@ jobs:
   sync:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: micnncim/action-label-syncer@v1
         with:
           prune: false

.github/workflows/lint.yml

@@ -2,13 +2,28 @@ name: Lint
 
 on: [push, pull_request, workflow_dispatch]
 
+env:
+  FORCE_COLOR: 1
+  PIP_DISABLE_PIP_VERSION_CHECK: 1
+
+permissions:
+  contents: read
+
 jobs:
   lint:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.x"
-      - uses: pre-commit/[email protected]
+          cache: pip
+      - uses: pre-commit/[email protected]
+
+      - name: Install dependencies
+        run: |
+          python3 -m pip install -U tox
+
+      - name: Mypy
+        run: tox -e mypy

.github/workflows/release-drafter.yml

@@ -29,6 +29,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Drafts your next release notes as pull requests are merged into "main"
-      - uses: release-drafter/release-drafter@v5
+      - uses: release-drafter/release-drafter@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/require-pr-label.yml

@@ -8,8 +8,12 @@ jobs:
   label:
     runs-on: ubuntu-latest
 
+    permissions:
+      issues: write
+      pull-requests: write
+
     steps:
-      - uses: mheap/github-action-required-labels@v3
+      - uses: mheap/github-action-required-labels@v5
         with:
           mode: minimum
           count: 1

.github/workflows/test.yml

@@ -11,18 +11,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["pypy3.8", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12-dev"]
+        python-version: ["pypy3.10", "3.9", "3.10", "3.11", "3.12", "3.13"]
         os: [windows-latest, macos-latest, ubuntu-latest]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
+          allow-prereleases: true
           cache: pip
-          cache-dependency-path: pyproject.toml
 
       - name: Install Linux dependencies
         if: startsWith(matrix.os, 'ubuntu')
@@ -49,7 +49,7 @@ jobs:
           tox -e py
 
       - name: Upload coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v3.1.5
         with:
           flags: ${{ matrix.os }}
           name: ${{ matrix.os }} Python ${{ matrix.python-version }}

.gitignore

@@ -152,5 +152,8 @@ dmypy.json
 # Cython debug symbols
 cython_debug/
 
+# hatch-vcs
+src/*/_version.py
+
 # Jetbrains IDEs
 .idea/

.pre-commit-config.yaml

@@ -1,86 +1,67 @@
 repos:
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.1
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.6.4
     hooks:
-      - id: pyupgrade
-        args: [--py37-plus]
+      - id: ruff
+        args: [--exit-non-zero-on-fix]
 
-  - repo: https://github.com/psf/black
-    rev: 23.3.0
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 24.8.0
     hooks:
       - id: black
 
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
-
-  - repo: https://github.com/PyCQA/autoflake
-    rev: v2.0.2
-    hooks:
-      - id: autoflake
-        name: autoflake
-        args:
-          [
-            "--in-place",
-            "--remove-unused-variables",
-            "--remove-all-unused-imports",
-          ]
-        language: python
-        files: \.py$
-
-  - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
-    hooks:
-      - id: flake8
-        additional_dependencies: [flake8-2020, flake8-errmsg, flake8-implicit-str-concat]
-
-  - repo: https://github.com/pre-commit/pygrep-hooks
-    rev: v1.10.0
-    hooks:
-      - id: python-check-blanket-noqa
-      - id: python-no-log-warn
-
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.6.0
     hooks:
+      - id: check-added-large-files
       - id: check-case-conflict
       - id: check-merge-conflict
       - id: check-json
       - id: check-toml
       - id: check-yaml
+      - id: debug-statements
       - id: end-of-file-fixer
+      - id: forbid-submodules
       - id: trailing-whitespace
         exclude: \.github/ISSUE_TEMPLATE\.md|\.github/PULL_REQUEST_TEMPLATE\.md
 
-  - repo: https://github.com/PyCQA/pydocstyle
-    rev: 6.3.0
+  - repo: https://github.com/python-jsonschema/check-jsonschema
+    rev: 0.29.2
     hooks:
-      - id: pydocstyle
-        args: ["--convention", "google"]
-        files: "src/"
+      - id: check-github-workflows
+      - id: check-renovate
 
-  - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.1.1
+  - repo: https://github.com/rhysd/actionlint
+    rev: v1.7.1
     hooks:
-      - id: mypy
-        additional_dependencies: [pytest, types-freezegun, types-setuptools]
-        args: [--strict]
+      - id: actionlint
 
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: 0.9.2
+    rev: 2.2.3
     hooks:
       - id: pyproject-fmt
 
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.12.2
+    rev: v0.19
     hooks:
       - id: validate-pyproject
 
   - repo: https://github.com/tox-dev/tox-ini-fmt
-    rev: 1.0.0
+    rev: 1.3.2
     hooks:
       - id: tox-ini-fmt
 
+  - repo: https://github.com/rbubley/mirrors-prettier
+    rev: v3.3.3
+    hooks:
+      - id: prettier
+        args: [--prose-wrap=always, --print-width=88]
+        exclude: \.github/ISSUE_TEMPLATE\.md|\.github/PULL_REQUEST_TEMPLATE\.md
+
+  - repo: meta
+    hooks:
+      - id: check-hooks-apply
+      - id: check-useless-excludes
+
 ci:
   autoupdate_schedule: quarterly

.readthedocs.yml

@@ -1,2 +1,19 @@
-python:
-    pip_install: true
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+# Project page: https://readthedocs.org/projects/python-humanize/
+
+version: 2
+
+mkdocs:
+  configuration: mkdocs.yml
+
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3"
+
+  commands:
+    - pip install -U tox
+    - tox -e docs
+    - mkdir _readthedocs
+    - mv site _readthedocs/html

README.md

@@ -2,16 +2,16 @@
 
 [![PyPI version](https://img.shields.io/pypi/v/humanize.svg?logo=pypi&logoColor=FFE873)](https://pypi.org/project/humanize/)
 [![Supported Python versions](https://img.shields.io/pypi/pyversions/humanize.svg?logo=python&logoColor=FFE873)](https://pypi.org/project/humanize/)
-[![Documentation Status](https://readthedocs.org/projects/python-humanize/badge/?version=latest)](https://python-humanize.readthedocs.io/en/latest/?badge=latest)
+[![Documentation Status](https://readthedocs.org/projects/python-humanize/badge/?version=latest)](https://humanize.readthedocs.io/en/latest/?badge=latest)
 [![PyPI downloads](https://img.shields.io/pypi/dm/humanize.svg)](https://pypistats.org/packages/humanize)
 [![GitHub Actions status](https://github.com/python-humanize/humanize/workflows/Test/badge.svg)](https://github.com/python-humanize/humanize/actions)
 [![codecov](https://codecov.io/gh/python-humanize/humanize/branch/main/graph/badge.svg)](https://codecov.io/gh/python-humanize/humanize)
 [![MIT License](https://img.shields.io/github/license/python-humanize/humanize.svg)](LICENCE)
 [![Tidelift](https://tidelift.com/badges/package/pypi/humanize)](https://tidelift.com/subscription/pkg/pypi-humanize?utm_source=pypi-humanize&utm_medium=badge)
 
-This modest package contains various common humanization utilities, like turning
-a number into a fuzzy human-readable duration ("3 minutes ago") or into a
-human-readable size or throughput. It is localized to:
+This modest package contains various common humanization utilities, like turning a
+number into a fuzzy human-readable duration ("3 minutes ago") or into a human-readable
+size or throughput. It is localized to:
 
 - Arabic
 - Basque
@@ -20,15 +20,19 @@ human-readable size or throughput. It is localized to:
 - Catalan
 - Danish
 - Dutch
+- Esperanto
 - European Portuguese
 - Finnish
 - French
 - German
 - Greek
+- Hebrew
 - Indonesian
 - Italian
 - Japanese
+- Klingon
 - Korean
+- Norwegian
 - Persian
 - Polish
 - Russian
@@ -43,7 +47,7 @@ human-readable size or throughput. It is localized to:
 
 ## API reference
 
-[https://python-humanize.readthedocs.io](https://python-humanize.readthedocs.io)
+[https://humanize.readthedocs.io](https://humanize.readthedocs.io/)
 
 <!-- usage-start -->