Merge pull request fluidattacks#1240 from dsalaza4/main

feat(back): fluidattacks#1171 use new builtin
dsalaza4 · Jan 9, 2024 · 8a8fc21 · 8a8fc21
2 parents 8846eec + baa398f
commit 8a8fc21
Show file tree

Hide file tree

Showing 10 changed files with 1,013 additions and 19 deletions.
diff --git a/makes/cli/env/runtime/pypi/main.nix b/makes/cli/env/runtime/pypi/main.nix
@@ -1,5 +1,5 @@
-{makePythonPypiEnvironment, ...}:
-makePythonPypiEnvironment {
-  name = "cli-env-runtime-pypi";
-  sourcesYaml = ./pypi-sources.yaml;
+{makePythonEnvironment, ...}:
+makePythonEnvironment {
+  pythonProjectDir = ./.;
+  pythonVersion = "3.11";
 }
diff --git a/makes/cli/env/runtime/pypi/poetry.lock b/makes/cli/env/runtime/pypi/poetry.lock
diff --git a/makes/cli/env/runtime/pypi/pyproject.toml b/makes/cli/env/runtime/pypi/pyproject.toml
@@ -0,0 +1,16 @@
+[tool.poetry]
+name = "makes-cli"
+version = "0.1.0"
+description = ""
+authors = ["Your Name <[email protected]>"]
+readme = "README.md"
+
+[tool.poetry.dependencies]
+python = "^3.11"
+rich = "12.6.0"
+textual = "0.1.18"
+
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
diff --git a/makes/cli/env/test/main.nix b/makes/cli/env/test/main.nix
@@ -1,5 +1,5 @@
-{makePythonPypiEnvironment, ...}:
-makePythonPypiEnvironment {
-  name = "cli-env-test";
-  sourcesYaml = ./pypi-sources.yaml;
+{makePythonEnvironment, ...}:
+makePythonEnvironment {
+  pythonProjectDir = ./.;
+  pythonVersion = "3.12";
 }
diff --git a/makes/cli/env/test/poetry.lock b/makes/cli/env/test/poetry.lock
diff --git a/makes/cli/env/test/pyproject.toml b/makes/cli/env/test/pyproject.toml
@@ -0,0 +1,16 @@
+[tool.poetry]
+name = "makes-cli-env-test"
+version = "0.1.0"
+description = ""
+authors = ["Your Name <[email protected]>"]
+readme = "README.md"
+
+[tool.poetry.dependencies]
+python = "^3.11"
+pytest = "7.4.4"
+pytest-cov = "4.1.0"
+
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
diff --git a/makes/docs/runtime/main.nix b/makes/docs/runtime/main.nix
@@ -1,21 +1,14 @@
 {
-  makePythonPypiEnvironment,
-  makeSearchPaths,
   __nixpkgs__,
+  makePythonEnvironment,
+  makeSearchPaths,
+  outputs,
   ...
 }:
 makeSearchPaths {
   bin = [
     __nixpkgs__.git
     __nixpkgs__.mkdocs
   ];
-  source = [
-    (makePythonPypiEnvironment {
-      name = "docs-runtime-pypi";
-      sourcesYaml = ./pypi/sources.yaml;
-      withSetuptools_67_7_2 = true;
-      withSetuptoolsScm_7_1_0 = true;
-      withWheel_0_40_0 = true;
-    })
-  ];
+  source = [outputs."/docs/runtime/pypi"];
 }
diff --git a/makes/docs/runtime/pypi/main.nix b/makes/docs/runtime/pypi/main.nix
@@ -0,0 +1,10 @@
+{makePythonEnvironment, ...}:
+makePythonEnvironment {
+  pythonProjectDir = ./.;
+  pythonVersion = "3.11";
+  overrides = self: super: {
+    mkdocs-material =
+      super.mkdocs-material.overridePythonAttrs
+      (old: {patchPhase = "echo Skip patchPhase";});
+  };
+}