Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(back): #1171 use new builtin #1240

Merged
merged 1 commit into from
Jan 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions makes/cli/env/runtime/pypi/main.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{makePythonPypiEnvironment, ...}:
makePythonPypiEnvironment {
name = "cli-env-runtime-pypi";
sourcesYaml = ./pypi-sources.yaml;
{makePythonEnvironment, ...}:
makePythonEnvironment {
pythonProjectDir = ./.;
pythonVersion = "3.11";
}
67 changes: 67 additions & 0 deletions makes/cli/env/runtime/pypi/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions makes/cli/env/runtime/pypi/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[tool.poetry]
name = "makes-cli"
version = "0.1.0"
description = ""
authors = ["Your Name <you@example.com>"]
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"
8 changes: 4 additions & 4 deletions makes/cli/env/test/main.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{makePythonPypiEnvironment, ...}:
makePythonPypiEnvironment {
name = "cli-env-test";
sourcesYaml = ./pypi-sources.yaml;
{makePythonEnvironment, ...}:
makePythonEnvironment {
pythonProjectDir = ./.;
pythonVersion = "3.12";
}
156 changes: 156 additions & 0 deletions makes/cli/env/test/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions makes/cli/env/test/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[tool.poetry]
name = "makes-cli-env-test"
version = "0.1.0"
description = ""
authors = ["Your Name <you@example.com>"]
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"
15 changes: 4 additions & 11 deletions makes/docs/runtime/main.nix
Original file line number Diff line number Diff line change
@@ -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"];
}
10 changes: 10 additions & 0 deletions makes/docs/runtime/pypi/main.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{makePythonEnvironment, ...}:
makePythonEnvironment {
pythonProjectDir = ./.;
pythonVersion = "3.11";
overrides = self: super: {
mkdocs-material =
super.mkdocs-material.overridePythonAttrs
(old: {patchPhase = "echo Skip patchPhase";});
};
}
Loading
Loading