Skip to content

Commit a8935ff

Browse files
committed
ci: update test automation to run PG17, Python 3.12, Python 3.13
1 parent db1a34e commit a8935ff

File tree

2 files changed

+23
-16
lines changed

2 files changed

+23
-16
lines changed

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
[ ps.sqlalchemy ] ++ ps.sqlalchemy.optional-dependencies.postgresql
1919
);
2020

21-
devPostgresql = pkgs.postgresql_15.overrideAttrs (oldAttrs: {} // pkgs.lib.optionalAttrs debugBuild { dontStrip = true; }); # If debug symbols are needed.
22-
devPython = pkgs.python310.withPackages (ps: (requiredPythonPackages ps));
21+
devPostgresql = pkgs.postgresql_17.overrideAttrs (oldAttrs: {} // pkgs.lib.optionalAttrs debugBuild { dontStrip = true; }); # If debug symbols are needed.
22+
devPython = pkgs.python313.withPackages (ps: (requiredPythonPackages ps));
2323

2424
testPythonVersions = with pkgs; [
25-
python39
26-
python310
25+
# python39 # end of security support is scheduled for 2025-10-31; therefore nixpkgs support was dropped before nixos 25.05 was released
26+
# python310 # error: sphinx-8.2.3 not supported for interpreter python3.10
2727
python311
28-
# python312 # tests are currently broken
29-
# python313 # tests are currently broken
28+
python312
29+
python313
3030
];
3131
testPostgresVersions = with pkgs; [
3232
postgresql_13
@@ -35,7 +35,7 @@
3535
postgresql_16
3636
postgresql_17
3737
];
38-
testVersionCombos = pkgs.lib.cartesianProductOfSets {
38+
testVersionCombos = pkgs.lib.cartesianProduct {
3939
python = testPythonVersions;
4040
postgres = testPostgresVersions;
4141
};
@@ -63,10 +63,13 @@
6363
chmod -R +w .
6464
'';
6565

66-
buildInputs = target_postgresql.buildInputs ++ [
67-
target_postgresql
66+
buildInputs = [
6867
(target_python.withPackages (ps: (requiredPythonPackages ps)))
6968
];
69+
nativeBuildInputs = [
70+
target_postgresql.pg_config
71+
pkgs.clang
72+
];
7073
installPhase = ''
7174
runHook preInstall
7275
install -D multicorn${target_postgresql.dlSuffix} -t $out/lib/
@@ -101,7 +104,9 @@
101104
chmod -R +w .
102105
'';
103106

104-
nativeBuildInputs = [ target_postgresql ];
107+
nativeBuildInputs = [
108+
target_postgresql.pg_config
109+
];
105110

106111
separateDebugInfo = true;
107112
};
@@ -128,6 +133,8 @@
128133
./test-3.9
129134
./test-3.10
130135
./test-3.11
136+
./test-3.12
137+
./test-3.13
131138
./test-common
132139
];
133140
unpackPhase = ''

0 commit comments

Comments
 (0)