diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml index e544b33e..a72c065d 100644 --- a/.github/workflows/artifacts.yml +++ b/.github/workflows/artifacts.yml @@ -177,7 +177,7 @@ jobs: - uses: Swatinem/rust-cache@v2 - uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.11" cache: pip cache-dependency-path: '**/requirements.dev.txt' - run: pip install -r python/requirements.dev.txt @@ -211,7 +211,7 @@ jobs: - uses: Swatinem/rust-cache@v2 - uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.11" cache: pip cache-dependency-path: '**/requirements.dev.txt' - run: Remove-Item -LiteralPath "C:\msys64\" -Force -Recurse diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e752ed0b..69788753 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -254,7 +254,7 @@ jobs: - uses: Swatinem/rust-cache@v2 - uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.11" cache: pip cache-dependency-path: '**/requirements.dev.txt' - run: pip install -r python/requirements.dev.txt @@ -288,7 +288,7 @@ jobs: - uses: Swatinem/rust-cache@v2 - uses: actions/setup-python@v4 with: - python-version: "3.7" + python-version: "3.8" cache: pip cache-dependency-path: '**/requirements.dev.txt' - run: pip install -r python/requirements.dev.txt @@ -308,7 +308,7 @@ jobs: - uses: Swatinem/rust-cache@v2 - uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.11" cache: pip cache-dependency-path: '**/requirements.dev.txt' - run: pip install "maturin~=1.0" diff --git a/python/Cargo.toml b/python/Cargo.toml index 6f3b59d4..242a4c0e 100644 --- a/python/Cargo.toml +++ b/python/Cargo.toml @@ -16,7 +16,7 @@ name = "pyoxigraph" doctest = false [features] -abi3 = ["pyo3/abi3-py37"] +abi3 = ["pyo3/abi3-py38"] [dependencies] oxigraph = { version = "0.4.0-alpha.1-dev", path="../lib", features = ["http_client"] } diff --git a/python/generate_stubs.py b/python/generate_stubs.py index 8a36f1b4..f343fd53 100644 --- a/python/generate_stubs.py +++ b/python/generate_stubs.py @@ -473,7 +473,7 @@ def build_doc_comment(doc: str) -> Optional[ast.Expr]: def format_with_black(code: str) -> str: result = subprocess.run( - ["python", "-m", "black", "-t", "py37", "--pyi", "-"], + ["python", "-m", "black", "-t", "py38", "--pyi", "-"], input=code.encode(), capture_output=True, ) @@ -498,9 +498,6 @@ if __name__ == "__main__": ) args = parser.parse_args() stub_content = ast.unparse(module_stubs(importlib.import_module(args.module_name))) - stub_content = stub_content.replace( - ", /", "" - ) # TODO: remove when targeting Python 3.8+ if args.black: stub_content = format_with_black(stub_content) args.out.write(stub_content) diff --git a/python/pyproject.toml b/python/pyproject.toml index e17c6a01..dbdc8cd1 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -11,7 +11,6 @@ classifiers = [ "License :: OSI Approved :: Apache Software License", "License :: OSI Approved :: MIT License", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", @@ -20,7 +19,7 @@ classifiers = [ "Topic :: Database :: Database Engines/Servers", "Topic :: Software Development :: Libraries :: Python Modules", ] -requires-python = ">=3.7" +requires-python = ">=3.8" [project.urls] Changelog = "https://github.com/oxigraph/oxigraph/blob/main/CHANGELOG.md" diff --git a/python/requirements.dev.txt b/python/requirements.dev.txt index 8e235e25..fb239ec8 100644 --- a/python/requirements.dev.txt +++ b/python/requirements.dev.txt @@ -3,4 +3,4 @@ furo maturin~=1.0 mypy~=1.0 ruff~=0.0.255 -sphinx~=5.3 +sphinx~=7.0