fotolab 0.31.1__tar.gz → 0.31.4__tar.gz

fotolab-0.31.4/.pre-commit-config.yaml

@@ -0,0 +1,120 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: check-case-conflict
+      - id: check-merge-conflict
+      - id: check-toml
+      - id: check-yaml
+      - id: debug-statements
+      - id: detect-private-key
+      - id: end-of-file-fixer
+      - id: mixed-line-ending
+      - id: trailing-whitespace
+
+  - repo: https://github.com/abravalheri/validate-pyproject
+    rev: v0.24.1
+    hooks:
+      - id: validate-pyproject
+        name: validate-pyproject
+
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.4.1
+    hooks:
+      - id: codespell
+        args:
+          - --ignore-words-list=astroid
+
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v4.0.0-alpha.8
+    hooks:
+      - id: prettier
+        exclude: (Pipfile.lock)
+
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.11.13
+    hooks:
+      - id: ruff-check
+        args: [--fix]
+      - id: ruff-format
+
+  # - repo: https://github.com/pycqa/isort
+  #   rev: 6.0.1
+  #   hooks:
+  #     - id: isort
+  #       additional_dependencies:
+  #         - isort[pyproject]
+  #       args:
+  #         - --profile=black
+  #         - --line-length=79
+  #         - --py=312
+
+  # - repo: https://github.com/psf/black
+  #   rev: 25.1.0
+  #   hooks:
+  #     - id: black
+  #       language_version: python3.13
+  #       args:
+  #         - --line-length=79
+  #         - --target-version=py38
+  #         - --target-version=py39
+  #         - --target-version=py310
+  #         - --target-version=py311
+  #         - --target-version=py312
+
+  # - repo: https://github.com/asottile/blacken-docs
+  #   rev: 1.19.1
+  #   hooks:
+  #     - id: blacken-docs
+  #       additional_dependencies:
+  #         - black==22.8.0
+
+  # - repo: https://github.com/PyCQA/autoflake
+  #   rev: v2.3.1
+  #   hooks:
+  #     - id: autoflake
+  #       args:
+  #         - --in-place
+  #         - --remove-unused-variables
+  #         - --remove-all-unused-imports
+  #       language: python
+  #       files: \.py$
+  #       language_version: python3.13
+
+  # - repo: https://github.com/PyCQA/flake8
+  #   rev: 7.2.0
+  #   hooks:
+  #     - id: flake8
+  #       language_version: python3.13
+  #       additional_dependencies:
+  #         - flake8-docstrings
+  #         - flake8-pytest-style
+  #       args:
+  #         - --docstring-convention=google
+  #         - --show-source
+  #         - --max-line-length=79
+  #         - --exclude=docs/source/conf.py
+  #         - --per-file-ignores=fotolab/*:D208 tests/*:D100,D103,D104,E501
+
+  # - repo: local
+  #   hooks:
+  #     - id: pylint
+  #       name: pylint
+  #       entry: pylint
+  #       language: system
+  #       types:
+  #         - python
+  #       exclude: docs/
+  #       args:
+  #         - fotolab
+  #         - tests
+  #         - --unsafe-load-any-extension=y
+  #         - --disable=R0801,W0212
+
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.16.0
+    hooks:
+      - id: mypy
+        exclude: docs/

{fotolab-0.31.1 → fotolab-0.31.4}/CHANGELOG.md

@@ -7,6 +7,23 @@ and this project adheres to [0-based versioning](https://0ver.org/).
 
 ## [Unreleased]
 
+## v0.31.4 (2025-06-15)
+
+- Fix `deps` job in `nox` session due to migration to `uv`
+- Fix `pre-commit` not available in `lint` session
+- Initial migration from `pipenv` to `uv`
+- Refactor release `nox` job to use uv version
+- Resolve `uv` not using nox's `venv` warning
+
+## v0.31.2 (2025-06-08)
+
+- Add `ruff` to dev deps
+- Add `ruff` to `pre-commit` hook
+- Bump `pre-commit` hook for mypy
+- Code format
+- Skip `pre-commit` manual installation
+- Sort deps
+
 ## v0.31.1 (2025-06-01)
 
 - Code format

{fotolab-0.31.1 → fotolab-0.31.4}/CONTRIBUTING.md

@@ -31,14 +31,14 @@ pyenv install $(cat .python-version)
 Install necessary packages:
 
 ```console
-python -m pip install --upgrade pip pipenv nox
-pipenv install --dev
+python -m pip install --upgrade pip uv nox
+uv pip install -e .[dev]
 ```
 
 Spawn a shell in virtual environment for your development:
 
 ```console
-pipenv shell
+uv shell
 ```
 
 Show all available `nox` sessions:

{fotolab-0.31.1 → fotolab-0.31.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: fotolab
-Version: 0.31.1
+Version: 0.31.4
 Summary: A console program that manipulate images.
 Keywords: photography,photo
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python
+License-File: LICENSE.md
 Requires-Dist: pillow
 Project-URL: Changelog, https://github.com/kianmeng/fotolab/blob/master/CHANGELOG.md
 Project-URL: Issues, https://github.com/kianmeng/fotolab/issues
@@ -27,28 +28,22 @@ A console program to manipulate photos.
 
 ## Installation
 
-Stable version From PyPI using `pipx`:
+Stable version From PyPI using `uv`:
 
 ```console
-pipx install fotolab
-```
-
-Stable version From PyPI using `pip`:
-
-```console
-python -m pip install fotolab
+uv pip install fotolab
 ```
 
 Upgrade to latest stable version:
 
 ```console
-python3 -m pip install fotolab --upgrade
+uv pip install fotolab --upgrade
 ```
 
 Latest development version from GitHub:
 
 ```console
-python -m pip install -e git+https://github.com/kianmeng/fotolab.git
+uv pip install -e git+https://github.com/kianmeng/fotolab.git
 ```
 
 ## Usage

{fotolab-0.31.1 → fotolab-0.31.4}/README.md

@@ -4,28 +4,22 @@ A console program to manipulate photos.
 
 ## Installation
 
-Stable version From PyPI using `pipx`:
+Stable version From PyPI using `uv`:
 
 ```console
-pipx install fotolab
-```
-
-Stable version From PyPI using `pip`:
-
-```console
-python -m pip install fotolab
+uv pip install fotolab
 ```
 
 Upgrade to latest stable version:
 
 ```console
-python3 -m pip install fotolab --upgrade
+uv pip install fotolab --upgrade
 ```
 
 Latest development version from GitHub:
 
 ```console
-python -m pip install -e git+https://github.com/kianmeng/fotolab.git
+uv pip install -e git+https://github.com/kianmeng/fotolab.git
 ```
 
 ## Usage

{fotolab-0.31.1 → fotolab-0.31.4}/fotolab/__init__.py

@@ -20,11 +20,12 @@ import logging
 import os
 import subprocess
 import sys
+from importlib import metadata
 from pathlib import Path
 
 from PIL import Image
 
-__version__ = "0.31.1"
+__version__ = metadata.version("fotolab")
 
 log = logging.getLogger(__name__)
 

{fotolab-0.31.1 → fotolab-0.31.4}/fotolab/subcommands/__init__.py

@@ -24,8 +24,7 @@ def build_subparser(subparsers):
     iter_namespace = pkgutil.iter_modules(__path__, __name__ + ".")
 
     subcommands = {
-        name: importlib.import_module(name)
-        for finder, name, ispkg in iter_namespace
+        name: importlib.import_module(name) for finder, name, ispkg in iter_namespace
     }
 
     for subcommand in subcommands.values():

{fotolab-0.31.1 → fotolab-0.31.4}/fotolab/subcommands/animate.py

@@ -123,10 +123,7 @@ def build_subparser(subparsers) -> None:
         type=int,
         default=4,
         choices=range(0, 7),
-        help=(
-            "set WEBP encoding method "
-            "(0=fast, 6=slow/best, default: '%(default)s')"
-        ),
+        help=("set WEBP encoding method (0=fast, 6=slow/best, default: '%(default)s')"),
         metavar="METHOD",
     )
 

{fotolab-0.31.1 → fotolab-0.31.4}/fotolab/subcommands/border.py

@@ -77,10 +77,7 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
         dest="width_right",
         type=int,
         default=0,
-        help=(
-            "set the width of right border in pixels"
-            " (default: '%(default)s')"
-        ),
+        help=("set the width of right border in pixels (default: '%(default)s')"),
         metavar="WIDTH",
     )
 
@@ -90,10 +87,7 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
         dest="width_bottom",
         type=int,
         default=0,
-        help=(
-            "set the width of bottom border in pixels"
-            " (default: '%(default)s')"
-        ),
+        help=("set the width of bottom border in pixels (default: '%(default)s')"),
         metavar="WIDTH",
     )
 

{fotolab-0.31.1 → fotolab-0.31.4}/fotolab/subcommands/contrast.py

@@ -31,9 +31,7 @@ def _validate_cutoff(value: str) -> float:
     try:
         f_value = float(value)
     except ValueError as e:
-        raise argparse.ArgumentTypeError(
-            f"invalid float value: '{value}'"
-        ) from e
+        raise argparse.ArgumentTypeError(f"invalid float value: '{value}'") from e
     if not 0 <= f_value <= 50:
         raise argparse.ArgumentTypeError(
             f"cutoff value {f_value} must be between 0 and 50"
@@ -43,9 +41,7 @@ def _validate_cutoff(value: str) -> float:
 
 def build_subparser(subparsers: argparse._SubParsersAction) -> None:
     """Build the subparser."""
-    contrast_parser = subparsers.add_parser(
-        "contrast", help="contrast an image."
-    )
+    contrast_parser = subparsers.add_parser("contrast", help="contrast an image.")
 
     contrast_parser.set_defaults(func=run)
 
@@ -103,8 +99,6 @@ def run(args: argparse.Namespace) -> None:
 
     for image_filename in args.image_filenames:
         original_image = Image.open(image_filename)
-        contrast_image = ImageOps.autocontrast(
-            original_image, cutoff=args.cutoff
-        )
+        contrast_image = ImageOps.autocontrast(original_image, cutoff=args.cutoff)
 
         save_image(args, contrast_image, image_filename, "contrast")

{fotolab-0.31.1 → fotolab-0.31.4}/fotolab/subcommands/halftone.py

@@ -37,9 +37,7 @@ class HalftoneCell(NamedTuple):
 
 def build_subparser(subparsers) -> None:
     """Build the subparser."""
-    halftone_parser = subparsers.add_parser(
-        "halftone", help="halftone an image"
-    )
+    halftone_parser = subparsers.add_parser("halftone", help="halftone an image")
 
     halftone_parser.set_defaults(func=run)
 
@@ -156,9 +154,7 @@ def _draw_halftone_dot(
     else:
         # Calculate brightness (luminance) from the RGB color
         brightness = int(
-            0.299 * pixel_value[0]
-            + 0.587 * pixel_value[1]
-            + 0.114 * pixel_value[2]
+            0.299 * pixel_value[0] + 0.587 * pixel_value[1] + 0.114 * pixel_value[2]
         )
         dot_fill = pixel_value  # Use original color for color dots
 

{fotolab-0.31.1 → fotolab-0.31.4}/fotolab/subcommands/info.py

@@ -107,9 +107,7 @@ def extract_exif_tags(image: Image.Image, sort: bool = False) -> dict:
     if exif:
         info = {ExifTags.TAGS.get(tag_id): exif.get(tag_id) for tag_id in exif}
 
-    filtered_info = {
-        key: value for key, value in info.items() if key is not None
-    }
+    filtered_info = {key: value for key, value in info.items() if key is not None}
     if sort:
         filtered_info = dict(sorted(filtered_info.items()))
 

{fotolab-0.31.1 → fotolab-0.31.4}/fotolab/subcommands/montage.py

@@ -27,9 +27,7 @@ log = logging.getLogger(__name__)
 
 def build_subparser(subparsers) -> None:
     """Build the subparser."""
-    montage_parser = subparsers.add_parser(
-        "montage", help="montage a list of image"
-    )
+    montage_parser = subparsers.add_parser("montage", help="montage a list of image")
 
     montage_parser.set_defaults(func=run)
 

{fotolab-0.31.1 → fotolab-0.31.4}/fotolab/subcommands/resize.py

@@ -59,10 +59,7 @@ def build_subparser(subparsers) -> None:
         "--canvas-color",
         default="black",
         dest="canvas_color",
-        help=(
-            "the color of the extended larger canvas"
-            "(default: '%(default)s')"
-        ),
+        help=("the color of the extended larger canvas(default: '%(default)s')"),
     )
 
     if "-c" in sys.argv or "--canvas" in sys.argv:

{fotolab-0.31.1 → fotolab-0.31.4}/fotolab/subcommands/watermark.py

@@ -109,10 +109,7 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
         dest="outline_width",
         type=int,
         default=2,
-        help=(
-            "set the outline width of the watermark text "
-            "(default: '%(default)s')"
-        ),
+        help=("set the outline width of the watermark text (default: '%(default)s')"),
         metavar="OUTLINE_WIDTH",
     )
 
@@ -122,10 +119,7 @@ def build_subparser(subparsers: argparse._SubParsersAction) -> None:
         dest="outline_color",
         type=str,
         default="black",
-        help=(
-            "set the outline color of the watermark text "
-            "(default: '%(default)s')"
-        ),
+        help=("set the outline color of the watermark text (default: '%(default)s')"),
         metavar="OUTLINE_COLOR",
     )
 
@@ -203,9 +197,7 @@ def run(args: argparse.Namespace) -> None:
         if image.format == "GIF":
             watermark_gif_image(image, image_filename, args)
         else:
-            watermarked_image: Image.Image = watermark_non_gif_image(
-                image, args
-            )
+            watermarked_image: Image.Image = watermark_non_gif_image(image, args)
             save_image(args, watermarked_image, image_filename, "watermark")
 
 
@@ -341,16 +333,12 @@ def calc_font_size(image: Image.Image, args: argparse.Namespace) -> int:
     return new_font_size
 
 
-def calc_font_outline_width(
-    image: Image.Image, args: argparse.Namespace
-) -> int:
+def calc_font_outline_width(image: Image.Image, args: argparse.Namespace) -> int:
     """Calculate the font padding based on the width of the image."""
     width, _height = image.size
     new_font_outline_width: int = args.outline_width
     if width > 600:
-        new_font_outline_width = math.floor(
-            FONT_OUTLINE_WIDTH_ASPECT_RATIO * width
-        )
+        new_font_outline_width = math.floor(FONT_OUTLINE_WIDTH_ASPECT_RATIO * width)
 
     log.debug("new font outline width: %d", new_font_outline_width)
     return new_font_outline_width

{fotolab-0.31.1 → fotolab-0.31.4}/noxfile.py

@@ -17,19 +17,17 @@
 
 """Nox configuration."""
 
-import ast
+import argparse
 import datetime
 
 import nox
-from packaging.version import Version
 
 
 @nox.session(python="3.9")
 def deps(session: nox.Session) -> None:
     """Update pre-commit hooks and deps."""
-    session.install("pre-commit", "pipenv")
+    _uv_install(session)
     session.run("pre-commit", "autoupdate", *session.posargs)
-    session.run("pipenv", "update", env={"PIPENV_VERBOSITY": "-1"})
 
 
 @nox.session(python="3.13")
@@ -40,25 +38,23 @@ def lint(session: nox.Session) -> None:
 
         nox -s lint -- pylint
     """
-    session.install("pre-commit")
+    _uv_install(session)
     session.run("pre-commit", "run", "--all-files", *session.posargs)
 
 
 @nox.session(python=["3.9", "3.10", "3.11", "3.12", "3.13"])
 def test(session: nox.Session) -> None:
     """Run test."""
-    _pipenv_install(session)
-    session.run(
-        "pipenv", "run", "pytest", "--numprocesses", "auto", *session.posargs
-    )
+    _uv_install(session)
+    session.run("uv", "run", "pytest", "--numprocesses", "auto", *session.posargs)
 
 
 @nox.session(python="3.13")
 def cov(session: nox.Session) -> None:
     """Run test coverage."""
-    _pipenv_install(session)
+    _uv_install(session)
     session.run(
-        "pipenv",
+        "uv",
         "run",
         "pytest",
         "--numprocesses",
@@ -73,18 +69,16 @@ def cov(session: nox.Session) -> None:
 @nox.session(python="3.13")
 def doc(session: nox.Session) -> None:
     """Build doc with sphinx."""
-    _pipenv_install(session)
-    session.run(
-        "sphinx-build", "docs/source/", "docs/build/html", *session.posargs
-    )
+    _uv_install(session)
+    session.run("sphinx-build", "docs/source/", "docs/build/html", *session.posargs)
 
 
 @nox.session(python="3.13")
 def readme(session: nox.Session) -> None:
     """Update console help menu to readme."""
-    _pipenv_install(session)
+    _uv_install(session)
     with open("README.md", "r+", encoding="utf8") as f:
-        help_message = session.run("fotolab", "-h", silent=True)
+        help_message = session.run("uv", "run", "fotolab", "-h", silent=True)
         help_codeblock = f"\n\n```console\n{help_message}```\n\n"
 
         content = f.read()
@@ -105,7 +99,7 @@ def readme(session: nox.Session) -> None:
             "env",
         ]:
             help_message = session.run(
-                "fotolab", subcommand, "-h", silent=True
+                "uv", "run", "fotolab", subcommand, "-h", silent=True
             )
             help_codeblock = f"\n\n```console\n{help_message}```\n\n"
 
@@ -127,72 +121,39 @@ def release(session: nox.Session) -> None:
         nox -s release -- minor
         nox -s release -- micro (default)
     """
-    with open("fotolab/__init__.py", "r", encoding="utf8") as f:
-        tree = ast.parse(f.read())
-        current_version = None
-        for node in ast.walk(tree):
-            if isinstance(node, ast.Assign) and len(node.targets) == 1:
-                target, value = node.targets[0], node.value
-                if target.id == "__version__" and isinstance(
-                    value, ast.Constant
-                ):
-                    current_version = value.s
-                    break
-
-        if current_version is None:
-            raise ValueError("Missing __version__ variable in __init__.py")
-
-        before_version = Version(current_version)
-
-        (major, minor, micro) = (
-            before_version.major,
-            before_version.minor,
-            before_version.micro,
-        )
-        if "major" in session.posargs:
-            major = major + 1
-            minor = 0
-            micro = 0
-
-        if "minor" in session.posargs:
-            minor = minor + 1
-            micro = 0
-
-        if "micro" in session.posargs or session.posargs == []:
-            micro = micro + 1
-
-        after_version = f"{major}.{minor}.{micro}"
-
-        _search_and_replace(
-            "fotolab/__init__.py", str(before_version), after_version
-        )
-
-        session.log(
-            f"Bumping version from {before_version} to {after_version}"
-        )
-
-        date = datetime.date.today().strftime("%Y-%m-%d")
-        before_header = "## [Unreleased]\n\n"
-        after_header = f"## [Unreleased]\n\n## v{after_version} ({date})\n\n"
-        _search_and_replace("CHANGELOG.md", before_header, after_header)
-
-        session.run(
-            "git",
-            "commit",
-            "--no-verify",
-            "-am",
-            f"Bump {after_version} release",
-            external=True,
-        )
-
-        if input("Publish package to pypi? (y/n): ").lower() in ["y", "yes"]:
-            session.run("flit", "build")
-            session.run("flit", "publish")
-
-
-def _pipenv_install(session: nox.Session) -> None:
-    session.install("pipenv")
-    session.run("pipenv", "install", "--dev", env={"PIPENV_VERBOSITY": "-1"})
+    _uv_install(session)
+
+    parser = argparse.ArgumentParser(description="Release a semver version.")
+    parser.add_argument(
+        "semver",
+        type=str,
+        nargs="?",
+        help="The type of semver release to make.",
+        default="patch",
+        choices={"major", "minor", "patch"},
+    )
+    args = parser.parse_args(args=session.posargs)
+
+    session.run("uv", "version", "--bump", args.semver)
+    after_version = session.run("uv", "version", "--short", silent=True).strip()
+
+    date = datetime.date.today().strftime("%Y-%m-%d")
+    before_header = "## [Unreleased]\n\n"
+    after_header = f"## [Unreleased]\n\n## v{after_version} ({date})\n\n"
+    _search_and_replace("CHANGELOG.md", before_header, after_header)
+
+    session.run(
+        "git",
+        "commit",
+        "--no-verify",
+        "-am",
+        f"Bump {after_version} release",
+        external=True,
+    )
+
+    if input("Publish package to pypi? (y/n): ").lower() in ["y", "yes"]:
+        session.run("flit", "build")
+        session.run("flit", "publish")
 
 
 def _search_and_replace(file, search, replace) -> None:
@@ -202,3 +163,22 @@ def _search_and_replace(file, search, replace) -> None:
         f.seek(0)
         f.write(content)
         f.truncate()
+
+
+def _uv_install(session: nox.Session) -> None:
+    """Install the project and its development dependencies using uv.
+
+    This also resolves the following error:
+        warning: `VIRTUAL_ENV=.nox/lint` does not match the project environment
+        path `.venv` and will be ignored
+
+    See https://nox.thea.codes/en/stable/cookbook.html#using-a-lockfile
+    """
+    session.run_install(
+        "uv",
+        "sync",
+        "--upgrade",
+        "--all-packages",
+        f"--python={session.virtualenv.location}",
+        env={"UV_PROJECT_ENVIRONMENT": session.virtualenv.location},
+    )