Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rspeer/python-ftfy
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v6.2.2
Choose a base ref
...
head repository: rspeer/python-ftfy
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v6.2.3
Choose a head ref
  • 3 commits
  • 6 files changed
  • 1 contributor

Commits on Aug 6, 2024

  1. Copy the full SHA
    09049ce View commit details
  2. more RtD fixes

    rspeer committed Aug 6, 2024
    Copy the full SHA
    2a4f6b4 View commit details
  3. v6.2.3: add metadata that PyPI needs

    rspeer committed Aug 6, 2024
    Copy the full SHA
    6d2aae0 View commit details
Showing with 30 additions and 19 deletions.
  1. +17 −11 .readthedocs.yaml
  2. +4 −0 CHANGELOG.md
  3. +1 −1 docs/conf.py
  4. +1 −1 ftfy/__init__.py
  5. +6 −5 pyproject.toml
  6. +1 −1 setup.py
28 changes: 17 additions & 11 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
# .readthedocs.yaml
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2
sphinx:
configuration: docs/conf.py

# Set the version of Python and other tools you might need
build:
os: ubuntu-24.04
tools:
python: "3.12"

python: "3.11"
jobs:
post_create_environment:
# Install poetry
# https://python-poetry.org/docs/#installing-manually
- python -m pip install poetry
post_install:
# Install only dependencies
# https://python-poetry.org/docs/managing-dependencies/#dependency-groups
- VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH poetry install
# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/conf.py

python:
install:
- method: pip
path: .
extra_requirements:
- docs
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## Version 6.2.3 (August 5, 2024)

- Updated PyPI metadata.

## Version 6.2.2 (August 5, 2024)

- Updated Read the Docs config so that docs might build again.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@
# The short X.Y version.
version = "6.2"
# The full version, including alpha/beta/rc tags.
release = "6.2.2"
release = "6.2.3"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
2 changes: 1 addition & 1 deletion ftfy/__init__.py
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@
from ftfy.badness import is_bad
from ftfy.formatting import display_ljust

__version__ = "6.2.2"
__version__ = "6.2.3"


# Though this function does nothing, it lets linters know that we're using
11 changes: 6 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
[tool.poetry]
name = "ftfy"
version = "6.2.2"
version = "6.2.3"
description = "Fixes mojibake and other problems with Unicode, after the fact"
homepage = "https://ftfy.readthedocs.io/en/latest/"
documentation = "https://ftfy.readthedocs.io/en/latest/"
repository = "https://github.com/rspeer/python-ftfy"
authors = ["Robyn Speer <rspeer@arborelia.net>"]
license = "Apache-2.0"
include = [
@@ -25,12 +28,10 @@ ruff = "^0.5.6"
[tool.poetry.scripts]
ftfy = "ftfy.cli:main"

[project.urls]
Homepage = "https://ftfy.readthedocs.io/en/latest/"
Documentation = "https://ftfy.readthedocs.io/en/latest/"
Repository = "https://github.com/rspeer/python-ftfy"
[tool.poetry.urls]
Issues = "https://github.com/rspeer/python-ftfy/issues/"
Changelog = "https://github.com/rspeer/python-ftfy/blob/main/CHANGELOG.md"
Cohost = "https://cohost.org/arborelia"

[build-system]
requires = ["poetry-core>=1.0.0"]
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@

setup(
name="ftfy",
version="6.2.2",
version="6.2.3",
maintainer="Robyn Speer",
maintainer_email="rspeer@arborelia.net",
license="Apache 2.0",