fotolab 0.31.2__tar.gz → 0.31.4__tar.gz

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

@@ -7,6 +7,14 @@ 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

{fotolab-0.31.2 → 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.2 → fotolab-0.31.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: fotolab
-Version: 0.31.2
+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.2 → 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.2 → 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.2"
+__version__ = metadata.version("fotolab")
 
 log = logging.getLogger(__name__)
 

{fotolab-0.31.2 → 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("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,22 +38,23 @@ def lint(session: nox.Session) -> None:
 
         nox -s lint -- pylint
     """
+    _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",
@@ -70,16 +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)
+    _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()
@@ -99,7 +98,9 @@ def readme(session: nox.Session) -> None:
             "watermark",
             "env",
         ]:
-            help_message = session.run("fotolab", subcommand, "-h", silent=True)
+            help_message = session.run(
+                "uv", "run", "fotolab", subcommand, "-h", silent=True
+            )
             help_codeblock = f"\n\n```console\n{help_message}```\n\n"
 
             marker = readme_md.split(f"<!--help-{subcommand} !-->")[1]
@@ -120,66 +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)
+    _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(
-            "git",
-            "commit",
-            "--no-verify",
-            "-am",
-            f"Bump {after_version} release",
-            external=True,
-        )
+    session.run("uv", "version", "--bump", args.semver)
+    after_version = session.run("uv", "version", "--short", silent=True).strip()
 
-        if input("Publish package to pypi? (y/n): ").lower() in ["y", "yes"]:
-            session.run("flit", "build")
-            session.run("flit", "publish")
+    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,
+    )
 
-def _pipenv_install(session: nox.Session) -> None:
-    session.install("pipenv")
-    session.run("pipenv", "install", "--dev", env={"PIPENV_VERBOSITY": "-1"})
+    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:
@@ -189,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},
+    )

{fotolab-0.31.2 → fotolab-0.31.4}/pyproject.toml

@@ -20,7 +20,8 @@ classifiers = [
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python",
 ]
-dynamic = ["version", "description"]
+version = "0.31.4"
+dynamic = ["description"]
 keywords = ["photography", "photo"]
 dependencies = [
     "pillow",
@@ -33,3 +34,27 @@ Source = "https://github.com/kianmeng/fotolab"
 
 [project.scripts]
 fotolab = "fotolab.cli:main"
+
+[dependency-groups]
+dev = [
+    "exceptiongroup",
+    "flake8-docstrings",
+    "flake8-print",
+    "flake8-pytest-style",
+    "flake8-simplify",
+    "flit",
+    "importlib-metadata",
+    "myst-parser",
+    "nox",
+    "pre-commit",
+    "pytest",
+    "pytest-cov",
+    "pytest-randomly",
+    "pytest-xdist",
+    "ruff",
+    "scripttest",
+    "sphinx",
+    "sphinx-autodoc-typehints",
+    "sphinx-copybutton",
+    "tomli",
+]