From 497862c56839e999b4d35344a8c07ca9271f943f Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 8 Oct 2022 11:22:13 +1300 Subject: [PATCH 1/4] bump version to 1.33.0 --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index f9246a6..31b7476 100644 --- a/default.nix +++ b/default.nix @@ -5,7 +5,7 @@ }: let # Poetry2nix version - version = "1.32.1"; + version = "1.33.0"; inherit (poetryLib) isCompatible readTOML normalizePackageName normalizePackageSet; From f884a3871df1bda628505d1ca2b28908024c392a Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sat, 8 Oct 2022 09:55:07 -0400 Subject: [PATCH 2/4] more build systems --- overrides/build-systems.json | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/overrides/build-systems.json b/overrides/build-systems.json index 79625f5..fe13bf2 100644 --- a/overrides/build-systems.json +++ b/overrides/build-systems.json @@ -3977,6 +3977,10 @@ "setuptools-scm" ], "docformatter": [ + { + "buildSystem": "poetry-core", + "from": "1.5.0" + }, "setuptools" ], "docker": [ @@ -7198,6 +7202,10 @@ "setuptools" ], "jupyter-core": [ + { + "buildSystem": "hatchling", + "from": "4.11.0" + }, "setuptools" ], "jupyter-lsp": [ @@ -8243,6 +8251,9 @@ "migen": [ "setuptools" ], + "mike": [ + "setuptools" + ], "milc": [ "setuptools" ], @@ -8326,6 +8337,9 @@ "mkdocs-gen-files": [ "poetry" ], + "mkdocs-git-revision-date-localized-plugin": [ + "setuptools" + ], "mkdocs-gitlab": [ "setuptools" ], @@ -8339,6 +8353,9 @@ "mkdocs-macros": [ "setuptools" ], + "mkdocs-macros-plugin": [ + "setuptools" + ], "mkdocs-material": [ "setuptools" ], @@ -8354,6 +8371,9 @@ "mkdocs-swagger-ui-tag": [ "setuptools" ], + "mkdocs-table-reader-plugin": [ + "setuptools" + ], "mkdocstrings": [ "pdm-pep517", "setuptools" @@ -13725,6 +13745,7 @@ "setuptools" ], "pyzmq": [ + "packaging", "setuptools" ], "pyzufall": [ @@ -17087,6 +17108,9 @@ "versiontools": [ "setuptools" ], + "verspec": [ + "setuptools" + ], "vertica-python": [ "setuptools" ], From 2d00c767e1c2ca5134115779728307db649cfa00 Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Sat, 8 Oct 2022 17:40:00 -0400 Subject: [PATCH 3/4] build-systems: pydeprecate --- overrides/build-systems.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/overrides/build-systems.json b/overrides/build-systems.json index fe13bf2..fb3fa24 100644 --- a/overrides/build-systems.json +++ b/overrides/build-systems.json @@ -11078,6 +11078,9 @@ "pydeps": [ "setuptools" ], + "pydeprecate": [ + "setuptools" + ], "pydes": [ "setuptools" ], From 0cf66e7e1083818f98c915356e1d89fcf8dced39 Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Sat, 8 Oct 2022 18:06:58 -0400 Subject: [PATCH 4/4] build-systems: prevent nbconvert from pulling CSS from the web during buildPhase --- overrides/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/overrides/default.nix b/overrides/default.nix index bcf38f7..bef7fd2 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -2528,6 +2528,12 @@ lib.composeManyExtensions [ 'root_dirs.extend(jupyter_path())' \ 'root_dirs.extend(jupyter_path() + [os.path.join("@out@", "share", "jupyter")])' \ --subst-var out + '' + lib.optionalString (lib.versionAtLeast self.nbconvert.version "7.0") '' + substituteInPlace \ + ./hatch_build.py \ + --replace \ + 'if self.target_name not in ["wheel", "sdist"]:' \ + 'if True:' ''; }); }