Skip to content

Commit

Permalink
Merge pull request #986 from dsalaza4/main
Browse files Browse the repository at this point in the history
refac(back): #985 drop oldest python version
  • Loading branch information
dsalaza4 authored Jan 4, 2023
2 parents 53f503c + 3ba94f2 commit 8f93602
Show file tree
Hide file tree
Showing 16 changed files with 10 additions and 438 deletions.
24 changes: 6 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1300,7 +1300,7 @@ Types:
Definitions of python packages/modules to lint.
Defaults to `{ }`.
- dirOfModulesType (`submodule`):
- python (`enum [ "3.7" "3.8" "3.9" "3.10"]`):
- python (`enum ["3.8" "3.9" "3.10"]`):
Python interpreter version that your package/module is designed for.
- searchPaths (`asIn makeSearchPaths`): Optional.
Arguments here will be passed as-is to `makeSearchPaths`.
Expand All @@ -1316,7 +1316,7 @@ Types:
- src (`str`):
Path to the package/module.
- moduleType (`submodule`):
- python (`enum [ "3.7" "3.8" "3.9" "3.10" ]`):
- python (`enum ["3.8" "3.9" "3.10"]`):
Python interpreter version that your package/module is designed for.
- searchPaths (`asIn makeSearchPaths`): Optional.
Arguments here will be passed as-is to `makeSearchPaths`.
Expand Down Expand Up @@ -1501,7 +1501,7 @@ Types:
Defaults to `{ }`.
- targetType (`submodule`):

- python (`enum [ "3.7" "3.8" "3.9" "3.10" ]`):
- python (`enum ["3.8" "3.9" "3.10"]`):
Python interpreter version that your package/module is designed for.
- src (`str`):
Path to the file or directory that contains the tests code.
Expand Down Expand Up @@ -1684,7 +1684,7 @@ Types:
Definitions of directories of python packages/modules to lint.
Defaults to `{ }`.
- projectType (`submodule`):
- python (`enum [ "3.7" "3.8" "3.9" "3.10" ]`):
- python (`enum ["3.8" "3.9" "3.10"]`):
Python interpreter version that your package/module is designed for.
- target (`str`):
Relative path to the package/module.
Expand Down Expand Up @@ -2656,7 +2656,7 @@ m github:fluidattacks/makes@22.11 /utils/makePythonLock \
"${sources_yaml}"
```
- Supported `python_version`s are: `3.7`, `3.8`, `3.9` and `3.10`.
- Supported `python_version`s are: `3.8`, `3.9` and `3.10`.
- `dependencies_yaml` is the **absolute path** to a [YAML][yaml] file
mapping [PyPI][python_pypi] packages to version constraints.
Expand Down Expand Up @@ -3234,12 +3234,6 @@ Types specific to [Python][python]:
to [MYPYPATH][mypypath].
Defaults to `[ ]`.
- `pythonMypy37` (`listOf coercibleToStr`): Optional.
Append `/lib/python3.7/site-packages`
of each element in the list
to [MYPYPATH][mypypath].
Defaults to `[ ]`.
- `pythonMypy38` (`listOf coercibleToStr`): Optional.
Append `/lib/python3.8/site-packages`
of each element in the list
Expand All @@ -3264,12 +3258,6 @@ Types specific to [Python][python]:
to [PYTHONPATH][pythonpath].
Defaults to `[ ]`.
- `pythonPackage37` (`listOf coercibleToStr`): Optional.
Append `/lib/python3.7/site-packages`
of each element in the list
to [PYTHONPATH][pythonpath].
Defaults to `[ ]`.
- `pythonPackage38` (`listOf coercibleToStr`): Optional.
Append `/lib/python3.8/site-packages`
of each element in the list
Expand Down Expand Up @@ -4207,7 +4195,7 @@ Types:
- makePythonVersion (`function str -> package`):
- (`enum [ "3.7" "3.8" "3.9" "3.10" ]`):
- (`enum ["3.8" "3.9" "3.10"]`):
[Python][python] version of the interpreter to return.
Example:
Expand Down
2 changes: 0 additions & 2 deletions makes/utils/makePythonLock/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,12 @@ function main {
}
}
}'
local implementations37=(any cp37 py2.py3 py35.py36.py37 py3 source 3.7)
local implementations38=(any cp38 py2.py3 py3 source)
local implementations39=(any cp39 py2.py3 py3 source)
local implementations310=(any cp310 py2.py3 py3 source)

true \
&& case "${python_version}" in
3.7) python=__argPy37__ && implementations=("${implementations37[@]}") ;;
3.8) python=__argPy38__ && implementations=("${implementations38[@]}") ;;
3.9) python=__argPy39__ && implementations=("${implementations39[@]}") ;;
3.10) python=__argPy310__ && implementations=("${implementations310[@]}") ;;
Expand Down
1 change: 0 additions & 1 deletion makes/utils/makePythonLock/main.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ makeScript {
entrypoint = ./entrypoint.sh;
name = "python-pypi2nix";
replace = {
__argPy37__ = makePythonVersion "3.7";
__argPy38__ = makePythonVersion "3.8";
__argPy39__ = makePythonVersion "3.9";
__argPy310__ = makePythonVersion "3.10";
Expand Down
6 changes: 0 additions & 6 deletions makes/utils/makePythonLock/update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ function main {
local cmd=(just m . /utils/makePythonLock)

: \
&& "${cmd[@]}" 3.7 \
"${PWD}/src/args/make-python-pypi-environment/sources/numpy-1.21.2/dependencies.yaml" \
"${PWD}/src/args/make-python-pypi-environment/sources/numpy-1.21.2/sources-37.yaml" \
&& "${cmd[@]}" 3.8 \
"${PWD}/src/args/make-python-pypi-environment/sources/numpy-1.21.2/dependencies.yaml" \
"${PWD}/src/args/make-python-pypi-environment/sources/numpy-1.21.2/sources-38.yaml" \
Expand All @@ -32,9 +29,6 @@ function main {
"${PWD}/src/args/lint-with-lizard/sources.yaml"

: \
&& "${cmd[@]}" 3.7 \
"${PWD}/src/evaluator/modules/lint-python/dependencies.yaml" \
"${PWD}/src/evaluator/modules/lint-python/sources-3.7.yaml" \
&& "${cmd[@]}" 3.8 \
"${PWD}/src/evaluator/modules/lint-python/dependencies.yaml" \
"${PWD}/src/evaluator/modules/lint-python/sources-3.8.yaml" \
Expand Down
1 change: 0 additions & 1 deletion src/args/lint-python/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ makeDerivation {
};
sourcesYaml =
{
"3.7" = ./pypi-sources-3.7.yaml;
"3.8" = ./pypi-sources-3.8.yaml;
"3.9" = ./pypi-sources-3.9.yaml;
"3.10" = ./pypi-sources-3.10.yaml;
Expand Down
Loading

0 comments on commit 8f93602

Please sign in to comment.