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

fix(back): #1070 update python linter deps #1081

Merged
merged 1 commit into from
Apr 28, 2023
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
21 changes: 9 additions & 12 deletions docs/src/api/extensions/python.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,17 +75,14 @@ Types:
- withNumpy_1_24_0 (`bool`): Optional.
Bootstrap numpy 1.24.0 to the environment
Defaults to `false`.
- withSetuptools_57_4_0 (`bool`): Optional.
Bootstrap setuptools 57.4.0 to the environment
- withSetuptools_67_7_2 (`bool`): Optional.
Bootstrap setuptools 67.7.2 to the environment
Defaults to `false`.
- withSetuptoolsScm_5_0_2 (`bool`) Optional.
Bootstrap setuptools-scm 5.0.2 to the environment
- withSetuptoolsScm_7_1_0 (`bool`) Optional.
Bootstrap setuptools-scm 7.1.0 to the environment
Defaults to `false`.
- withSetuptoolsScm_6_0_1 (`bool`) Optional.
Bootstrap setuptools-scm 6.0.1 to the environment
Defaults to `false`.
- withWheel_0_37_0 (`bool`): Optional.
Bootstrap wheel 0.37.0 to the environment
- withWheel_0_40_0 (`bool`): Optional.
Bootstrap wheel 0.40.0 to the environment
Defaults to `false`.

Example:
Expand Down Expand Up @@ -115,9 +112,9 @@ Example:
# Other packages require a few bootstrapped dependencies,
# enable them like this:
withCython_0_29_24 = true;
withSetuptools_57_4_0 = true;
withSetuptoolsScm_6_0_1 = true;
withWheel_0_37_0 = true;
withSetuptools_67_7_2 = true;
withSetuptoolsScm_7_1_0 = true;
withWheel_0_40_0 = true;
}
```

Expand Down
6 changes: 3 additions & 3 deletions src/args/lint-python-imports/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ makeDerivation {
(makePythonPypiEnvironment {
name = "lint-python-imports";
sourcesYaml = ./pypi-sources.yaml;
withSetuptools_57_4_0 = true;
withSetuptoolsScm_6_0_1 = true;
withWheel_0_37_0 = true;
withSetuptools_67_7_2 = true;
withSetuptoolsScm_7_1_0 = true;
withWheel_0_40_0 = true;
})
];
}
6 changes: 3 additions & 3 deletions src/args/lint-python/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ makeDerivation {
"3.11" = ./pypi-sources-3.11.yaml;
}
.${python};
withSetuptools_57_4_0 = true;
withSetuptoolsScm_5_0_2 = true;
withWheel_0_37_0 = true;
withSetuptools_67_7_2 = true;
withSetuptoolsScm_7_1_0 = true;
withWheel_0_40_0 = true;
})
];
};
Expand Down
48 changes: 21 additions & 27 deletions src/args/make-python-pypi-environment/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@
sourcesYaml ? null,
withCython_0_29_24 ? false,
withNumpy_1_24_0 ? false,
withSetuptools_57_4_0 ? false,
withSetuptoolsScm_5_0_2 ? false,
withSetuptoolsScm_6_0_1 ? false,
withWheel_0_37_0 ? false,
withSetuptools_67_7_2 ? false,
withSetuptoolsScm_7_1_0 ? false,
withWheel_0_40_0 ? false,
}:
assert builtins.any (_: _) [
(sourcesJson == null && sourcesRaw != null && sourcesYaml == null)
Expand Down Expand Up @@ -72,15 +71,15 @@ assert builtins.any (_: _) [
.${sources.python};
withCython_0_29_24 = true;
}))
(listOptional withWheel_0_37_0 (makePythonPypiEnvironment {
name = "wheel-0.37.0";
(listOptional withWheel_0_40_0 (makePythonPypiEnvironment {
name = "wheel-0.40.0";
sourcesYaml = toFileYaml "sources.yaml" {
closure.wheel = "0.37.0";
closure.wheel = "0.40.0";
links = [
{
name = "wheel-0.37.0-py2.py3-none-any.whl";
sha256 = "1za6c4s0yjy1dzprmib3kph40hr8xgj3apdsnqs00v9wv4mln091";
url = "https://pypi.org/packages/py2.py3/w/wheel/wheel-0.37.0-py2.py3-none-any.whl";
name = "wheel-0.40.0-py3-none-any.whl";
sha256 = "0izjbcsxh6nawadg540g34q5q758xralra0g77rdl8mmgh7b4dnj";
url = "https://pypi.org/packages/py3/w/wheel/wheel-0.40.0-py3-none-any.whl";
}
];
inherit (sources) python;
Expand Down Expand Up @@ -109,25 +108,20 @@ assert builtins.any (_: _) [
})
(builtins.concatLists [
sources.links
(listOptional withSetuptools_57_4_0 {
name = "setuptools-57.4.0-py3-none-any.whl";
sha256 = "1mhq6jw21sglccqmimydqi2rjvh3g5xjykb16gcvkkx6gabk14m4";
url = "https://pypi.org/packages/py3/s/setuptools/setuptools-57.4.0-py3-none-any.whl";
(listOptional withSetuptools_67_7_2 {
name = "setuptools-67.7.2-py3-none-any.whl";
sha256 = "0awmhw9a3z21qqhrd0xgaqjpnlbp5pqh69yk06wcwlnahmmziai3";
url = "https://pypi.org/packages/py3/s/setuptools/setuptools-67.7.2-py3-none-any.whl";
})
(listOptional withSetuptoolsScm_6_0_1 {
name = "setuptools_scm-6.0.1-py3-none-any.whl";
sha256 = "0p4i5nypfdqzjlmlkwvy45107y7kpq3x9s5zq2jl9vwd3iq5zgf3";
url = "https://files.pythonhosted.org/packages/py3/s/setuptools_scm/setuptools_scm-6.0.1-py3-none-any.whl";
(listOptional withSetuptoolsScm_7_1_0 {
name = "setuptools_scm-7.1.0-py3-none-any.whl";
sha256 = "13ix4l2q4w34h1kpalyaryxr55d2dsc8r91a2jpy42c7hinqp63k";
url = "https://files.pythonhosted.org/packages/py3/s/setuptools_scm/setuptools_scm-7.1.0-py3-none-any.whl";
})
(listOptional withSetuptoolsScm_5_0_2 {
name = "setuptools_scm-5.0.2-py2.py3-none-any.whl";
sha256 = "0d3by5bk5l57s63gfba2lv28hi147kmrmy29fl8kw42cywvlwp5x";
url = "https://files.pythonhosted.org/packages/6a/18/23ad8654c5c8d91d1238b2d52882e50152473f2bd2db0da60215b51f401b/setuptools_scm-5.0.2-py2.py3-none-any.whl";
})
(listOptional withWheel_0_37_0 {
name = "wheel-0.37.0-py2.py3-none-any.whl";
sha256 = "1za6c4s0yjy1dzprmib3kph40hr8xgj3apdsnqs00v9wv4mln091";
url = "https://pypi.org/packages/py2.py3/w/wheel/wheel-0.37.0-py2.py3-none-any.whl";
(listOptional withWheel_0_40_0 {
name = "wheel-0.40.0-py3-none-any.whl";
sha256 = "0izjbcsxh6nawadg540g34q5q758xralra0g77rdl8mmgh7b4dnj";
url = "https://pypi.org/packages/py3/w/wheel/wheel-0.40.0-py3-none-any.whl";
})
(listOptional true {
name = "pip-21.2.4-py3-none-any.whl";
Expand Down