python-bindings: Incremental building

Can now do this: $ nix develop .#python $ cd python $ make Also reuses the common.sh/init.sh testing scripts
NixOS · Feb 7, 2023 · 098a31b · 098a31b
1 parent f079036
commit 098a31b
Show file tree

Hide file tree

Showing 12 changed files with 76 additions and 52 deletions.
diff --git a/Makefile b/Makefile
@@ -21,7 +21,8 @@ makefiles = \
   misc/upstart/local.mk \
   doc/manual/local.mk \
   tests/local.mk \
-  tests/plugins/local.mk
+  tests/plugins/local.mk \
+  python/local.mk
 
 -include Makefile.config
 

diff --git a/flake.nix b/flake.nix
@@ -388,49 +388,10 @@
               postUnpack = "sourceRoot=$sourceRoot/perl";
             });
 
-            passthru.python-bindings =
-              let
-                python = final.python3;
-              in python.pkgs.buildPythonPackage {
-                name = "nix";
-                format = "other";
-
-                src = self;
-                postUnpack = "sourceRoot=$sourceRoot/python";
-
-                nativeBuildInputs = [
-                  final.buildPackages.ninja
-                  (final.buildPackages.meson.override { python3 = python; })
-                  final.buildPackages.pkgconfig
-                  final.buildPackages.nix
-                ];
-
-                strictDeps = true;
-
-                buildInputs = [
-                  final.nix
-                  final.boost
-                ];
-
-                installCheckPhase = ''
-                  export TEST_ROOT=$(mktemp -d)
-                  export NIX_STATE_DIR=$TEST_ROOT/var/nix
-                  export NIX_STORE_DIR=$TEST_ROOT/store
-                  export NIX_LOCALSTATE_DIR=$TEST_ROOT/var
-                  export NIX_LOG_DIR=$TEST_ROOT/var/log/nix
-
-                  export NIX_CONF_DIR=$TEST_ROOT/etc
-                  mkdir "$NIX_CONF_DIR"
-                  cat > "$NIX_CONF_DIR"/nix.conf <<EOF
-                  sandbox = false
-                  substituters =
-                  EOF
-
-                  export PYTHONPATH=$out/${python.sitePackages}
-
-                  ninja test
-                '';
-              };
+            passthru.python-bindings = final.callPackage ./python {
+              inherit self;
+              python = final.python3;
+            };
 
             meta.platforms = systems;
           };
@@ -768,7 +729,15 @@
               '';
           }
         )
-        // { default = self.devShells.${system}.stdenv; }
+        // {
+          default = self.devShells.${system}.stdenv;
+          python = nixpkgsFor.${system}.mkShell {
+            inputsFrom = [
+              self.devShells.${system}.stdenv
+              (self.packages.${system}.nix.python-bindings.override { nix = null; })
+            ];
+          };
+        }
       );
 
   };

diff --git a/python/.gitignore b/python/.gitignore
@@ -1 +1,2 @@
 .cache
+build
diff --git a/python/Makefile b/python/Makefile
@@ -0,0 +1,9 @@
+test:
+	$(MAKE) -C .. python/build tests/common.sh
+	meson test -C python/build -v
+
+build:
+	$(MAKE) -C .. python/build
+	meson compile -C python/build
+
+.PHONY: build test
diff --git a/python/default.nix b/python/default.nix
@@ -0,0 +1,24 @@
+{ self, python, ninja, meson, pkg-config, boost, nix }:
+python.pkgs.buildPythonPackage {
+  name = "nix";
+  format = "other";
+
+  src = self;
+  postUnpack = "sourceRoot=$sourceRoot/python";
+
+  nativeBuildInputs = [
+    ninja
+    (meson.override { python3 = python; })
+    pkg-config
+    nix
+  ];
+
+  strictDeps = true;
+
+  buildInputs = [
+    nix
+    boost
+  ];
+
+  installCheckPhase = "meson test -v";
+}
diff --git a/python/local.mk b/python/local.mk
@@ -0,0 +1,8 @@
+pythonbuild=$(d)/python/build
+
+clean-files += $(pythonbuild)
+
+python/build: src/libexpr/nix-expr.pc $(libdir)/libnixexpr.so src/libmain/nix-main.pc $(libdir)/libnixmain.so
+	rm -rf $(pythonbuild)
+	PKG_CONFIG_PATH=$(libdir)/pkgconfig:$$PKG_CONFIG_PATH meson setup $(pythonbuild) python
+	touch python/build
diff --git a/python/meson.build b/python/meson.build
@@ -8,7 +8,12 @@ python_dep = dependency('python3', required : true)
 nix_expr_dep = dependency('nix-expr', required: true)
 nix_main_dep = dependency('nix-main', required: true)
 
-python = python_mod.find_python()
-test('python test', python, args : files('tests.py'))
-
 subdir('src')
+
+fs = import('fs')
+
+env = environment()
+env.prepend('PYTHONPATH', fs.parent(pythonix.full_path()))
+bash = find_program('bash')
+test('python test', bash, args : files('test.sh'), env : env)
+
diff --git a/python/src/internal/nix-to-python.hh b/python/src/internal/nix-to-python.hh
@@ -2,7 +2,7 @@
 
 #include <Python.h>
 
-#include <nix/config.h>
+#include <config.h>
 
 #include <eval.hh>
 

diff --git a/python/src/internal/python-to-nix.hh b/python/src/internal/python-to-nix.hh
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Python.h>
-#include <nix/config.h>
+#include <config.h>
 
 #include <eval.hh>
 #include <optional>

diff --git a/python/src/meson.build b/python/src/meson.build
@@ -5,7 +5,7 @@ src = [
   'python-module.cc',
 ]
 
-python_mod.extension_module('nix', src,
+pythonix = python_mod.extension_module('nix', src,
     dependencies : [python_dep, nix_expr_dep, nix_main_dep],
     install: true,
     install_dir: python_mod.sysconfig_path('platlib'),

diff --git a/python/src/python-module.cc b/python/src/python-module.cc
@@ -3,7 +3,7 @@
 #include "internal/eval.hh"
 #include "internal/ptr.hh"
 
-#include <nix/config.h>
+#include <config.h>
 
 #include <eval.hh>
 #include <globals.hh>

diff --git a/python/test.sh b/python/test.sh
@@ -0,0 +1,7 @@
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+cd "$SCRIPT_DIR"/../tests
+
+source init.sh
+
+python "$SCRIPT_DIR"/tests.py