Merge pull request #42 from offspot/deps-upgrade

GHCR OCI Images support

Author: rgaudin

.github/workflows/Publish.yaml

@@ -9,8 +9,8 @@ env:
 
 jobs:
   build-binary:
-    # building on ubuntu-20.04 so we'll link to glibc 2.31 (bullseye+)
-    runs-on: ubuntu-24.04
+    # building on ubuntu-22.04 so we'll link to glibc 2.35 (bookworm+)
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v3

.github/workflows/QA.yaml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   check-qa:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v3
@@ -24,9 +24,6 @@ jobs:
           pip install -U pip
           pip install -e .[lint,scripts,test,check]
 
-      - name: Check black formatting
-        run: inv lint-black
-
       - name: Check ruff
         run: inv lint-ruff
 

.github/workflows/Tests.yaml

@@ -11,8 +11,8 @@ env:
 
 jobs:
   build-binary:
-    # building on ubuntu-20.04 so we'll link to glibc 2.31 (bullseye+)
-    runs-on: ubuntu-24.04
+    # building on ubuntu-22.04 so we'll link to glibc 2.35 (bookworm+)
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v3

.pre-commit-config.yaml

@@ -2,20 +2,16 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.4.0
+  rev: v6.0.0
   hooks:
   -   id: trailing-whitespace
   -   id: end-of-file-fixer
-- repo: https://github.com/psf/black
-  rev: "24.2.0"
-  hooks:
-  -   id: black
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.2.2
+  rev: v0.15.5
   hooks:
   - id: ruff
 - repo: https://github.com/RobertCraigie/pyright-python
-  rev: v1.1.352
+  rev: v1.1.408
   hooks:
   - id: pyright
     name: pyright (system)

CHANGELOG.md

@@ -5,11 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [1.1.5] - 2026-03-11
 
 ### Fixed
 
 - [workflows] Uploading to correct folder (#41)
+- Support for latest GHCR images (OCI manifest) via docker-export 1.2
+
+### Changed
+
+- Bumped most dependencies
 
 ## [1.1.4] - 2025-12-10
 

get-oci-sizes.py

@@ -25,7 +25,7 @@
 """
 
 import pathlib
-import subprocess
+import subprocess  # noqa: S404
 import sys
 import tarfile
 import tempfile

pyproject.toml

@@ -15,47 +15,51 @@ license = {text = "GPL-3.0-or-later"}
 classifiers = [
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
 ]
 dependencies = [
-    "requests==2.31.0",
+    "requests==2.32.5",
+    "types-requests==2.32.4.20260107",
     "PyYAML==6.0.1",
-    "cli-ui==0.17.2",
+    "cli-ui==0.19.0",
     "humanfriendly==10.0",
-    "progressbar2==4.4.2",
-    "docker-export==1.1.0",
-    "typeguard==4.1.5",
-    "offspot-config==2.2.0",
+    "progressbar2==4.5.0",
+    "docker-export==1.2.0",
+    "typeguard==4.5.1",
+    "offspot-config==2.9.2",
     # "offspot-config@git+https://github.com/offspot/offspot-config#egg=main",
     "natsort==8.4.0",
-    "aria2p==0.12.0",
+    "aria2p==0.12.1",
 ]
 dynamic = ["version"]
 
 [project.optional-dependencies]
 scripts = [
-  "invoke==2.2.0",
+  "invoke==2.2.1",
+  "types-invoke==2.0.0.10",
 ]
 lint = [
-  "black==24.2.0",
-  "ruff==0.2.2",
+  "ruff==0.15.5",
 ]
 check = [
-  "pyright==1.1.358",
+  "pyright==1.1.408",
 ]
 test = [
-  "pytest==8.0.2",
-  "pytest-cov==4.1.0",
-  "coverage==7.4.3",
+  "pytest==9.0.2",
+  "pytest-cov==7.0.0",
+  "coverage==7.13.4",
 ]
 binary = [
   "ordered-set==4.1.0",
   "zstandard==0.25.0",
-  "nuitka==2.8.9",
-  "requests==2.31.0",
+  "nuitka==4.0.3",
+  "requests==2.32.5",
 ]
 dev = [
-  "pre-commit==3.6.0",
+  "pre-commit==4.5.1",
   "image-creator[scripts]",
   "image-creator[lint]",
   "image-creator[test]",
@@ -81,7 +85,7 @@ exclude = [
 ]
 
 [[tool.hatch.envs.default.matrix]]
-python = ["3.11"]
+python = ["3.11", "3.12", "3.13", "3.14"]
 
 [tool.hatch.envs.default]
 features = ["dev"]
@@ -90,7 +94,7 @@ features = ["dev"]
 features = ["scripts", "test"]
 
 [[tool.hatch.envs.test.matrix]]
-python = ["3.11"]
+python = ["3.11", "3.12", "3.13", "3.14"]
 
 [tool.hatch.envs.test.scripts]
 run = "inv test --args '{args}'"
@@ -115,6 +119,9 @@ fixall = "inv fixall --args '{args}'"
 [tool.hatch.envs.check]
 features = ["scripts", "check"]
 
+[[tool.hatch.envs.check.matrix]]
+python = ["3.11", "3.12", "3.13", "3.14"]
+
 [tool.hatch.envs.check.scripts]
 pyright = "inv check-pyright --args '{args}'"
 all = "inv checkall --args '{args}'"
@@ -123,22 +130,21 @@ all = "inv checkall --args '{args}'"
 features = ["scripts", "binary"]
 
 [[tool.hatch.envs.binary.matrix]]
-python = ["3.11"]
+python = ["3.13"]
 
 [tool.hatch.envs.binary.scripts]
 build = "inv binary --filename '{args}'"
 download-aria2 = "inv download-aria2c"
 
-[tool.black]
-line-length = 88
-target-version = ['py311']
-
 [tool.ruff]
-target-version = "py311"
 line-length = 88
 src = ["src"]
 
+[tool.ruff.format]
+preview = true
+
 [tool.ruff.lint]
+preview = true
 select = [
   "A",  # flake8-builtins
   # "ANN",  # flake8-annotations
@@ -210,7 +216,9 @@ ignore = [
   # Ignore complexity
   "C901", "PLR0911", "PLR0912", "PLR0913", "PLR0915",
   # naive UTC timezones
-  "DTZ003"
+  "DTZ003",
+  # allow method that dont use self
+  "PLR6301",
 ]
 unfixable = [
   # Don't touch unused imports
@@ -220,10 +228,6 @@ unfixable = [
 [tool.ruff.lint.isort]
 known-first-party = ["image_creator"]
 
-[tool.ruff.lint.flake8-bugbear]
-# add exceptions to B008 for fastapi.
-extend-immutable-calls = ["fastapi.Depends", "fastapi.Query"]
-
 [tool.ruff.lint.flake8-tidy-imports]
 ban-relative-imports = "all"
 

src/image_creator/__init__.py

@@ -1 +1 @@
-__version__ = "1.1.4"
+__version__ = "1.1.5"