Skip to content

Commit

Permalink
build: supports python3.13
Browse files Browse the repository at this point in the history
  • Loading branch information
linw1995 committed Oct 12, 2024
1 parent 050c5bc commit fc65233
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ help:
EMPTY :=
SPACE := $(EMPTY) $(EMPTY)

PYTHON = 3.11
PYTHON = 3.13
EXTRAS = parser
DEV_EXTRAS = test docs
EXTRAS_ARGS = $(if $(EXTRAS),-G,) $(subst $(SPACE),$(SPACE)-G$(SPACE),$(EXTRAS))
Expand Down
5 changes: 0 additions & 5 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@
dream2nix.modules.dream2nix.WIP-python-pdm
];

deps = {nixpkgs, ...}: {
pkgs = nixpkgs;
python = nixpkgs.python3;
};

mkDerivation = {
src = lib.cleanSourceWith {
src = lib.cleanSource ./.;
Expand Down
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 12 additions & 7 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,13 @@
"x86_64-linux"
];
in {
packages = eachSystem (system: {
packages = eachSystem (system: let
pkgs = import nixpkgs {
inherit system;
};
in {
default = dream2nix.lib.evalModules {
packageSets.nixpkgs = nixpkgs.legacyPackages.${system};
packageSets.nixpkgs = pkgs;
modules = [
./default.nix
{
Expand All @@ -34,15 +38,16 @@
in {
default = pkgs.mkShell {
inputsFrom = [self.packages.${system}.default.devShell];
buildInputs = with pkgs; [

packages = with pkgs; [
pre-commit
python3Packages.nox

python39
python310
python311
python312
];
packages = with pkgs; [
pre-commit
python312Packages.nox
python313
];
};
});
Expand Down
2 changes: 1 addition & 1 deletion noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,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)
Expand Down
4 changes: 1 addition & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ classifiers = [
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Development Status :: 5 - Production/Stable",
"Operating System :: POSIX",
"Operating System :: MacOS :: MacOS X",
Expand Down Expand Up @@ -54,6 +55,3 @@ version = { use_scm = true }
docs = ["sphinx~=7.4", "livereload ~= 2.6", "lark ~= 1.2", "tornado>=6.3.2"]
test = ["pytest-cov ~= 5.0", "pytest ~= 8.0", "pexpect ~= 4.8", "sybil ~= 8.0"]
build_readme = ["pygments ~= 2.8", "docutils >= 0.16"]

[tool.pdm.options]
lock = ["-S", "inherit_metadata,no_cross_platform"]

0 comments on commit fc65233

Please sign in to comment.