envsub 0.2.0__tar.gz → 1.0.0__tar.gz

{envsub-0.2.0 → envsub-1.0.0}/.github/workflows/build-wheels.yml

@@ -45,15 +45,15 @@ jobs:
           - os: linux
             manylinux: auto
             target: armv7
-            interpreter: 3.9 3.10 3.11 3.12 3.13
+            interpreter: 3.11 3.12 3.13 3.14 3.14t 3.15 3.15t
           - os: linux
             manylinux: auto
             target: ppc64le
-            interpreter: 3.9 3.10 3.11 3.12 3.13
+            interpreter: 3.11 3.12 3.13 3.14 3.14t 3.15 3.15t
           - os: linux
             manylinux: auto
             target: s390x
-            interpreter: 3.9 3.10 3.11 3.12 3.13
+            interpreter: 3.11 3.12 3.13 3.14 3.14t 3.15 3.15t
           - os: linux
             manylinux: auto
             target: x86_64
@@ -71,15 +71,14 @@ jobs:
             target: x86_64
           - os: macos
             target: aarch64
-            interpreter: 3.9 pypy3.9 pypy3.10
 
           - os: windows
             target: x86_64
-            interpreter: 3.11 3.12 3.13
+            interpreter: 3.11 3.12 3.13 3.14 3.14t 3.15 3.15t
           - os: windows
             target: i686
             python-architecture: x86
-            interpreter: 3.11 3.12 3.13
+            interpreter: 3.11 3.12 3.13 3.14 3.14t 3.15 3.15t
         exclude:
           # Exclude failed build
           - os: windows
@@ -92,7 +91,7 @@ jobs:
       - name: set up python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.13'
+          python-version: '3.14'
           architecture: ${{ matrix.python-architecture || 'x64' }}
       - name: install build deps
         run: pip install twine
@@ -102,7 +101,7 @@ jobs:
         with:
           target: ${{ matrix.target }}
           manylinux: ${{ matrix.manylinux }}
-          args: --release --out dist --interpreter ${{ matrix.interpreter || '3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10' }}
+          args: --release --out dist --interpreter ${{ matrix.interpreter || '3.11 3.12 3.13 3.14 3.14t 3.15 3.15t pypy3.11' }}
           rust-toolchain: 'stable'
           docker-options: -e CI
 

{envsub-0.2.0 → envsub-1.0.0}/.gitignore

@@ -11,4 +11,4 @@ wheels/
 
 # Rust stuff
 target
-envsub/*.so
+src/python/envsub/*.so

{envsub-0.2.0 → envsub-1.0.0}/CHANGELOG.md

@@ -1,11 +1,20 @@
+## 1.0.0  -  2026-11-11
+
+* Add support of python 3.14 and 3.15
+* Remove support of python 3.9 and 3.10 
+
+## 0.2.1  -  2025-04-17
+
+* Fix links in documentation.
+
 ## 0.2.0  -  2025-02-16
 
-* Replace twine by us publish
-* Add some badges
+* Replace twine by us publish.
+* Add some badges.
 
 ## 0.1.18  -  2025-02-16
 
-* Publish documentation using github pages 
+* Publish documentation using github pages.
 
 ## 0.1.17  -  2024-11-10
 * Fix license inconcistency. This is MIT license.

{envsub-0.2.0 → envsub-1.0.0}/Cargo.lock

@@ -1,22 +1,10 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "autocfg"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+version = 4
 
 [[package]]
 name = "envsub"
-version = "0.2.0"
+version = "1.0.0"
 dependencies = [
  "pyo3",
 ]
@@ -27,32 +15,17 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
-[[package]]
-name = "indoc"
-version = "2.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
-
 [[package]]
 name = "libc"
 version = "0.2.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
 
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "once_cell"
-version = "1.20.2"
+version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
 [[package]]
 name = "portable-atomic"
@@ -62,46 +35,41 @@ checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.88"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
+checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "pyo3"
-version = "0.22.5"
+version = "0.29.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d922163ba1f79c04bc49073ba7b32fd5a8d3b76a87c955921234b8e77333c51"
+checksum = "700d18fa267b73b9b521fd7e13580e2f446916f176cacee1ab63fcc8191f1655"
 dependencies = [
- "cfg-if",
- "indoc",
  "libc",
- "memoffset",
  "once_cell",
  "portable-atomic",
  "pyo3-build-config",
  "pyo3-ffi",
  "pyo3-macros",
- "unindent",
 ]
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.22.5"
+version = "0.29.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc38c5feeb496c8321091edf3d63e9a6829eab4b863b4a6a65f26f3e9cc6b179"
+checksum = "7b3fc0c4d08f6bb10e71fe39dfb9e2f59c6eb6854e22ec8092f50c69a4499adb"
 dependencies = [
- "once_cell",
  "target-lexicon",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.22.5"
+version = "0.29.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94845622d88ae274d2729fcefc850e63d7a3ddff5e3ce11bd88486db9f1d357d"
+checksum = "dfc0b8e19df29aad7086cf977bb0c2a2f143e30567eb113e9cf72b62ca698330"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -109,9 +77,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.22.5"
+version = "0.29.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e655aad15e09b94ffdb3ce3d217acf652e26bbc37697ef012f5e5e348c716e5e"
+checksum = "6100e8a4b5eba53afaa5ed078364851a0b2499c553a44c31026b929049b49dc6"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -121,13 +89,12 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.22.5"
+version = "0.29.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1e3f09eecd94618f60a455a23def79f79eba4dc561a97324bf9ac8c6df30ce"
+checksum = "6143877a16e82b5a727b7127ff4cd86858a24a28d745d72f43e6f227c7b1bdb3"
 dependencies = [
  "heck",
  "proc-macro2",
- "pyo3-build-config",
  "quote",
  "syn",
 ]
@@ -143,9 +110,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.81"
+version = "2.0.119"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "198514704ca887dd5a1e408c6c6cdcba43672f9b4062e1b24aa34e74e6d7faae"
+checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -154,18 +121,12 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.16"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca"
 
 [[package]]
 name = "unicode-ident"
 version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
-
-[[package]]
-name = "unindent"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"

{envsub-0.2.0 → envsub-1.0.0}/Cargo.toml

@@ -1,18 +1,20 @@
 [package]
 name = "envsub"
-version = "0.2.0"
+version = "1.0.0"
 authors = ["Guillaume Gauvrit <guillaume@gauvr.it>"]
-edition = "2021"
+edition = "2024"
 description = "A text preprocessing tool with environment variable substitution and default value support."
-license = "BSD-3-Clause"
+license = "MIT"
+license-file = "LICENSE"
 readme = "README.md"
 
 [dependencies]
-pyo3 = { version = "0.22.5", features = ["extension-module"] }
+pyo3 = { version = "0.29", features = ["abi3-py311", "extension-module"] }
 
 [lib]
 name = "envsub"
 crate-type = ["staticlib"]
+path = "src/rust/lib.rs"
 
 [package.metadata.maturin]
 bindings = "pyo3"

{envsub-0.2.0 → envsub-1.0.0}/Justfile

@@ -4,6 +4,9 @@ develop:
   uv run maturin develop
 
 install:
+    uv sync --group dev --frozen
+
+update:
     uv sync --group dev
 
 doc:
@@ -22,6 +25,12 @@ lf:
     uv run pytest --lf -vvv
 
 
+fmt:
+    cargo fmt
+    uv run ruff check --fix .
+    uv run ruff format src/python tests
+
+
 release major_minor_patch: && changelog
     #!/bin/bash
     cargo release {{major_minor_patch}} --no-confirm --no-tag --no-push --no-publish --execute

{envsub-0.2.0 → envsub-1.0.0}/PKG-INFO

@@ -1,8 +1,13 @@
 Metadata-Version: 2.4
 Name: envsub
-Version: 0.2.0
+Version: 1.0.0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Rust
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Text Processing
@@ -17,22 +22,20 @@ Provides-Extra: docs
 License-File: LICENSE
 Summary: A text preprocessing tool with environment variable substitution.
 Keywords: environment,substitution,variables
-Author: Guillaume Gauvrit <guillaume@gauvr.it>
 Author-email: Guillaume Gauvrit <guillaume@gauvr.it>
-License: MIT License
-Requires-Python: >=3.9
+License: MIT
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
-Project-URL: Homepage, https://mardiros.github.io/envsub/
-Project-URL: Documentation, https://mardiros.github.io/mardiros/envsub
-Project-URL: Repository, https://github.com/mardiros/envsub.git
+Project-URL: Changelog, https://mardiros.github.io/envsub/changelog.html
+Project-URL: Documentation, https://mardiros.github.io/envsub/
+Project-URL: Homepage, https://github.com/mardiros/envsub/
 Project-URL: Issues, https://github.com/mardiros/envsub/issues
-Project-URL: Changelog, https://mardiros.github.io/mardiros/envsub/changelog.html
+Project-URL: Repository, https://github.com/mardiros/envsub.git
 
 # envsub
 
 [![Documentation](https://github.com/mardiros/envsub/actions/workflows/publish-doc.yml/badge.svg)](https://mardiros.github.io/envsub/)
 [![Continuous Integration](https://github.com/mardiros/envsub/actions/workflows/tests.yml/badge.svg)](https://github.com/mardiros/envsub/actions/workflows/tests.yml)
-[![Maintainability](https://api.codeclimate.com/v1/badges/a63ad49239e41de4f6b7/maintainability)](https://codeclimate.com/github/mardiros/envsub/maintainability)
 
 **envsub** is a text preprocessing tool that performs environment variable
 substitution in files, with support for default values. Written in Rust and

{envsub-0.2.0 → envsub-1.0.0}/README.md

@@ -2,7 +2,6 @@
 
 [![Documentation](https://github.com/mardiros/envsub/actions/workflows/publish-doc.yml/badge.svg)](https://mardiros.github.io/envsub/)
 [![Continuous Integration](https://github.com/mardiros/envsub/actions/workflows/tests.yml/badge.svg)](https://github.com/mardiros/envsub/actions/workflows/tests.yml)
-[![Maintainability](https://api.codeclimate.com/v1/badges/a63ad49239e41de4f6b7/maintainability)](https://codeclimate.com/github/mardiros/envsub/maintainability)
 
 **envsub** is a text preprocessing tool that performs environment variable
 substitution in files, with support for default values. Written in Rust and

{envsub-0.2.0 → envsub-1.0.0}/docs/source/conf.py

@@ -10,17 +10,18 @@
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
-import os
 import sys
-
 import tomllib
+from pathlib import Path
+
+rootpath = Path(__file__).parents[2]
 
-sys.path.insert(0, os.path.abspath("../../src"))
+sys.path.insert(0, str(rootpath / "src"))
 
 
 # -- Project information -----------------------------------------------------
 def _get_project_meta():
-    with open("../../pyproject.toml", "rb") as pyproject:
+    with open(str(rootpath / "pyproject.toml"), "rb") as pyproject:
         return tomllib.load(pyproject)["project"]
 
 
@@ -46,7 +47,7 @@ extensions = [
 ]
 
 autodoc2_packages = [
-    {"path": "../../envsub"},
+    {"path": str(rootpath / "envsub")},
 ]
 
 autodoc2_module_all_regexes = [

{envsub-0.2.0 → envsub-1.0.0}/pyproject.toml

@@ -1,15 +1,20 @@
 [project]
 name = "envsub"
-version = "0.2.0"
+version = "1.0.0"
 description = "A text preprocessing tool with environment variable substitution."
 readme = "README.md"
-license = { text = "MIT License" }
+license = { text = "MIT" }
 authors = [{ name = "Guillaume Gauvrit", email = "guillaume@gauvr.it" }]
-requires-python = ">=3.9"
+requires-python = ">=3.11"
 keywords = ["environment", "substitution", "variables"]
 classifiers = [
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: 3.15",
     "Programming Language :: Rust",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Text Processing",
@@ -42,20 +47,27 @@ docs = [
     "myst-parser >=4.0.0,<5; python_version >= '3.10'",
 ]
 
-
 [project.scripts]
-envsub = "envsub:sub"
+envsub = "envsub.__main__:main"
 
 [project.urls]
-Homepage = "https://mardiros.github.io/envsub/"
-Documentation = "https://mardiros.github.io/mardiros/envsub"
+Homepage = "https://github.com/mardiros/envsub/"
+Documentation = "https://mardiros.github.io/envsub/"
 Repository = "https://github.com/mardiros/envsub.git"
 Issues = "https://github.com/mardiros/envsub/issues"
-Changelog = "https://mardiros.github.io/mardiros/envsub/changelog.html"
+Changelog = "https://mardiros.github.io/envsub/changelog.html"
+
+[tool.pyright]
+extraPaths = ["src/python"]
+include = ["src/python", "tests"]
+typeCheckingMode = "strict"
+reportMissingTypeStubs = false
+venvPath = ".venv"
 
 [tool.maturin]
 bindings = "pyo3"
+python-source = "src/python"
 
 [build-system]
-requires = ["maturin>=1.0,<2.0"]
+requires = ["maturin>=1.16,<2.0"]
 build-backend = "maturin"

{envsub-0.2.0 → envsub-1.0.0/src/python}/envsub/__main__.py

@@ -3,12 +3,13 @@ A module executable from the shell, it read stdin, it writes std out.
 
 ```bash
 $ echo "db: ${DATABASE_URL-sqlite:///}" > config.yml
-$ cat config.yml | python -m envsub
+$ python -m envsub < config.yml
 db: sqlite:///
 ```
 """
 
 import sys
+
 from .envsub import sub
 
 

{envsub-0.2.0 → envsub-1.0.0/src/python}/envsub/envsub.pyi

@@ -2,7 +2,6 @@
 
 from typing import TextIO
 
-
 def sub(downstream: TextIO) -> TextIO:
     """
     Replace all the envar from a downstream and return an upstream.

{envsub-0.2.0/src → envsub-1.0.0/src/rust}/lib.rs

@@ -98,7 +98,8 @@ impl RustTextIOWrapper {
         Ok(slf)
     }
 
-    pub fn __exit__(&mut self, _exc_type: PyObject, _exc_value: PyObject, _traceback: PyObject) {}
+    pub fn __exit__(&mut self, _exc_type: Py<PyAny>, _exc_value: Py<PyAny>, _traceback: Py<PyAny>) {
+    }
 }
 
 #[pyfunction]

envsub-1.0.0/tests/test_main.py

@@ -0,0 +1,12 @@
+import io
+
+from envsub.__main__ import main
+
+
+def test_main(monkeypatch):
+    monkeypatch.setenv("NAME", "World")
+    stdout = io.StringIO()
+    monkeypatch.setattr("sys.stdin", io.StringIO("Hello, ${NAME}!"))
+    monkeypatch.setattr("sys.stdout", stdout)
+    main()
+    assert stdout.getvalue() == "Hello, World!"

{envsub-0.2.0 → envsub-1.0.0}/tests/test_subenv.py

@@ -1,9 +1,7 @@
-import os
-
 from io import StringIO
+
 import pytest
 import yaml
-
 from envsub import sub
 
 
@@ -120,9 +118,9 @@ def test_readline(envvars, params):
     line = upstream.readline()
     assert line == params["expected"][1]
     line = upstream.readline()
-    assert line == ''
+    assert line == ""
     line = upstream.readline()
-    assert line == ''
+    assert line == ""
 
 
 @pytest.mark.parametrize(