Merge pull request #105 from linw1995/feat/py313

build: supports python3.13

Author: linw1995

.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Set up PDM
         uses: pdm-project/setup-pdm@v3
         with:
-          python-version: 3.12
+          python-version: 3.13
       - name: Cache Nox Virtualenvs
         uses: actions/cache@v1
         with:
@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9, "3.10", "3.11", "3.12"]
+        python-version: [3.9, "3.10", "3.11", "3.12", "3.13"]
     steps:
       - uses: actions/checkout@v1
       - name: Set up PDM
@@ -67,7 +67,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9, "3.10", "3.11", "3.12"]
+        python-version: [3.9, "3.10", "3.11", "3.12", "3.13"]
     steps:
       - uses: actions/checkout@v1
       - name: Set up PDM

Makefile

@@ -15,7 +15,7 @@ help:
 EMPTY :=
 SPACE := $(EMPTY) $(EMPTY)
 
-PYTHON = 3.12
+PYTHON = 3.13
 EXTRAS = lxml cssselect jsonpath-extractor jsonpath-rw jsonpath-rw-ext
 DEV_EXTRAS = test test-mypy-plugin docs
 EXTRAS_ARGS = $(if $(EXTRAS),-G,) $(subst $(SPACE),$(SPACE)-G$(SPACE),$(EXTRAS))
@@ -26,7 +26,7 @@ init:
 	@echo ">> installing $(if $(EXTRAS),\"$(EXTRAS)\" ,)$(if $(DEV_EXTRAS),\"$(DEV_EXTRAS)\" ,)dependencies by pdm"
 	$(if $(PYTHON),pdm use -f $(PYTHON),)
 	pdm info && pdm info --env
-	pdm sync -v $(EXTRAS_ARGS) $(DEV_EXTRAS_ARGS)
+	pdm install $(EXTRAS_ARGS) $(DEV_EXTRAS_ARGS)
 	pdm config -l python.use_venv true
 
 deinit:

README.rst

@@ -101,13 +101,13 @@ Usage
 Changelog
 <<<<<<<<<
 
-v1.0.0
-~~~~~~~~~~
+v1.0.1
+~~~~~~
 
-**Feature**
+**Build**
+
+- Supports Python 3.13
 
-- Generic extractor with convertor (#83)
-- mypy plugin for type annotation of extracting result (#83)
 
 
 Contributing

default.nix

@@ -7,11 +7,6 @@
     dream2nix.modules.dream2nix.WIP-python-pdm
   ];
 
-  deps = {nixpkgs, ...}: {
-    pkgs = nixpkgs;
-    python = nixpkgs.python3;
-  };
-
   mkDerivation = {
     src = lib.cleanSourceWith {
       src = lib.cleanSource ./.;

docs/source/changelog.rst

@@ -2,13 +2,13 @@
 Changelog
 =========
 
-v1.0.0
-~~~~~~~~~~
+v1.0.1
+~~~~~~
 
-**Feature**
+**Build**
+
+- Supports Python 3.13
 
-- Generic extractor with convertor (#83)
-- mypy plugin for type annotation of extracting result (#83)
 
 .. include:: history.rst
     :start-line: 4

docs/source/history.rst

@@ -2,6 +2,14 @@
 History
 =======
 
+v1.0.0
+~~~~~~
+
+**Feature**
+
+- Generic extractor with convertor (#83)
+- mypy plugin for type annotation of extracting result (#83)
+
 v0.10.2
 ~~~~~~~
 

flake.nix

@@ -18,7 +18,7 @@
   in {
     packages = eachSystem (system: {
       default = dream2nix.lib.evalModules {
-        packageSets.nixpkgs = nixpkgs.legacyPackages.${system};
+        packageSets.nixpkgs = import nixpkgs {inherit system;};
         modules = [
           ./default.nix
           {
@@ -33,16 +33,19 @@
       pkgs = import nixpkgs {inherit system;};
     in {
       default = pkgs.mkShell {
-        inputsFrom = [self.packages.${system}.default.devShell];
-        buildInputs = with pkgs; [
-          python39
-          python310
-          python311
-          python312
+        inputsFrom = [
+          self.packages.${system}.default.devShell
         ];
+
         packages = with pkgs; [
           pre-commit
           python312Packages.nox
+
+          python39
+          python310
+          python311
+          python312
+          python313
         ];
       };
     });

noxfile.py

@@ -9,7 +9,7 @@
 nox.options.stop_on_first_error = True
 
 
-pythons = ["3.9", "3.10", "3.11", "3.12"]
+pythons = ["3.9", "3.10", "3.11", "3.12", "3.13"]
 
 os.environ.update({"PDM_IGNORE_SAVED_PYTHON": "1"})
 os.environ.pop("PYTHONPATH", None)
@@ -43,7 +43,6 @@ def coverage_test(session, extractor_backend):
         lambda s: s.run(
             "pdm",
             "sync",
-            "-v",
             "-G",
             "test",
             *(("-G", extractor_backend) if extractor_backend else tuple()),
@@ -65,7 +64,7 @@ def coverage_test(session, extractor_backend):
 def coverage_report(session):
     venv_setup_on_create(
         session,
-        lambda s: s.run("pdm", "sync", "-v", "-G", "test", external=True),
+        lambda s: s.run("pdm", "sync", "-G", "test", external=True),
     )
     session.run("coverage", "report")
     session.run("coverage", "xml")
@@ -79,7 +78,7 @@ def coverage_report(session):
 def test_mypy_plugin(session):
     venv_setup_on_create(
         session,
-        lambda s: s.run("pdm", "sync", "-v", "-G", "test-mypy-plugin", external=True),
+        lambda s: s.run("pdm", "sync", "-G", "test-mypy-plugin", external=True),
     )
 
     session.run(
@@ -98,7 +97,7 @@ def test_mypy_plugin(session):
 def build_readme(session):
     venv_setup_on_create(
         session,
-        lambda s: s.run("pdm", "sync", "-v", "-G", "build_readme", external=True),
+        lambda s: s.run("pdm", "sync", "-G", "build_readme", external=True),
     )
     session.run(
         "python", "scripts/build_readme.py", "README.template.rst", "README.rst"