Merge pull request #1714 from cpcloud/pyogrio

overrides/build-systems.json

@@ -18037,6 +18037,10 @@
  "pyogg": [
  "setuptools"
  ],
+ "pyogrio": [
+ "cython",
+ "setuptools"
+ ],
  "pyombi": [
  "setuptools"
  ],

overrides/default.nix

@@ -1784,9 +1784,9 @@ lib.composeManyExtensions [
  format =
  if ((old.format or null) == "poetry2nix") then
  (if lib.versionAtLeast prev.numpy.version "2.0.0" then
-  "pyproject"
-  else "setuptools"
- )
+ "pyproject"
+ else "setuptools"
+  )
  else
  old.format or null;
  nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ gfortran ];
@@ -2461,6 +2461,10 @@ lib.composeManyExtensions [
  }
  );
 
+ pyogrio = prev.pyogrio.overridePythonAttrs (old: {
+ nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ final.versioneer gdal ];
+ });
+
  pyopencl = prev.pyopencl.overridePythonAttrs (
  old: {
  nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ final.numpy ];
@@ -3857,12 +3861,12 @@ lib.composeManyExtensions [
  pyee = prev.pyee.overrideAttrs (
  old: {
  postPatch = old.postPatch or "" +
- (lib.optionalString (lib.versionOlder old.version "10.0.0")
- ''
- sed -i setup.py \
- -e '/setup_requires/,/],/d' \
- -e 's/vcversioner={},/version="${old.version}",/'
- '');
+  (lib.optionalString (lib.versionOlder old.version "10.0.0")
+  ''
+  sed -i setup.py \
+  -e '/setup_requires/,/],/d' \
+  -e 's/vcversioner={},/version="${old.version}",/'
+  '');
  }
  );
 

tests/default.nix

@@ -172,6 +172,7 @@ in
  scikit-learn = callTest ./scikit-learn { };
  soundfile-wheel = callTest ./soundfile-wheel { };
  soundfile = callTest ./soundfile { };
+ pyogrio = callTest ./pyogrio { };
 } // lib.optionalAttrs (!stdenv.isDarwin) {
  # Editable tests fails on Darwin because of sandbox paths
  pep600 = callTest ./pep600 { };

tests/pyogrio/default.nix

@@ -0,0 +1,29 @@
+{ poetry2nix, python3, runCommand }:
+let
+ mkEnv = preferWheel: poetry2nix.mkPoetryEnv {
+ python = python3;
+ pyproject = ./pyproject.toml;
+ poetrylock = ./poetry.lock;
+ overrides = poetry2nix.overrides.withDefaults (
+ _: prev: {
+ pyogrio = prev.pyogrio.override {
+ inherit preferWheel;
+ };
+ numpy = prev.numpy.override {
+ preferWheel = true;
+ };
+ pandas = prev.pandas.override {
+ preferWheel = true;
+ };
+ }
+ );
+ };
+ wheelEnv = mkEnv true;
+ srcEnv = mkEnv false;
+in
+runCommand "pyogrio-test" { } ''
+ set -euo pipefail
+ ${wheelEnv}/bin/python -c 'import pyogrio; print(f"wheel: {pyogrio.__version__}")' > $out
+ ${srcEnv}/bin/python -c 'import pyogrio; print(f"src: {pyogrio.__version__}")' >> $out
+ touch $out
+''

tests/pyogrio/pyproject.toml

@@ -0,0 +1,13 @@
+[tool.poetry]
+name = "test-pyogrio"
+version = "0.1.0"
+description = "Test of pyogrio"
+authors = ["Your Name <[email protected]>"]
+
+[tool.poetry.dependencies]
+python = "^3.10"
+pyogrio = "^0.9.0"
+
+[build-system]
+requires = ["poetry-core>=1"]
+build-backend = "poetry.core.masonry.api"