Benjamin Staffin
2 years ago
committed by
Benjamin Staffin
commit
34006ebc9d
@ -0,0 +1,32 @@ |
||||
# This file contains a list of commits that are not likely what you |
||||
# are looking for in a blame, such as mass reformatting or renaming. |
||||
# You can set this file as a default ignore file for blame by running |
||||
# the following command. |
||||
# |
||||
# $ git config blame.ignoreRevsFile .git-blame-ignore-revs |
||||
# |
||||
# To temporarily not use this file add |
||||
# --ignore-revs-file="" |
||||
# to your blame command. |
||||
# |
||||
# The ignoreRevsFile can't be set globally due to blame failing if the file isn't present. |
||||
# To not have to set the option in every repository it is needed in, |
||||
# save the following script in your path with the name "git-bblame" |
||||
# now you can run |
||||
# $ git bblame $FILE |
||||
# to use the .git-blame-ignore-revs file if it is present. |
||||
# |
||||
# #!/usr/bin/env bash |
||||
# repo_root=$(git rev-parse --show-toplevel) |
||||
# if [[ -e $repo_root/.git-blame-ignore-revs ]]; then |
||||
# git blame --ignore-revs-file="$repo_root/.git-blame-ignore-revs" $@ |
||||
# else |
||||
# git blame $@ |
||||
# fi |
||||
|
||||
|
||||
# nixos/modules/rename: Sort alphabetically |
||||
1f71224fe86605ef4cd23ed327b3da7882dad382 |
||||
|
||||
# nixos: fix module paths in rename.nix |
||||
d08ede042b74b8199dc748323768227b88efcf7c |
||||
@ -0,0 +1,47 @@ |
||||
name: "Update terraform-providers" |
||||
|
||||
on: |
||||
schedule: |
||||
- cron: "14 3 * * 1" |
||||
workflow_dispatch: |
||||
|
||||
jobs: |
||||
tf-providers: |
||||
if: github.repository_owner == 'NixOS' && github.ref == 'refs/heads/master' # ensure workflow_dispatch only runs on master |
||||
runs-on: ubuntu-latest |
||||
steps: |
||||
- uses: actions/checkout@v3 |
||||
- uses: cachix/install-nix-action@v16 |
||||
- name: setup |
||||
id: setup |
||||
run: | |
||||
echo ::set-output name=title::"terraform-providers: update $(date -u +"%Y-%m-%d")" |
||||
- name: update terraform-providers |
||||
run: | |
||||
git config user.email "41898282+github-actions[bot]@users.noreply.github.com" |
||||
git config user.name "github-actions[bot]" |
||||
pushd pkgs/applications/networking/cluster/terraform-providers |
||||
./update-all-providers --no-build |
||||
git commit -m "${{ steps.setup.outputs.title }}" providers.json |
||||
popd |
||||
- name: create PR |
||||
uses: peter-evans/create-pull-request@v3 |
||||
with: |
||||
body: | |
||||
Automatic update of terraform providers. |
||||
|
||||
Created by [update-terraform-providers](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/update-terraform-providers.yml) action. |
||||
|
||||
Check that all providers build with `@ofborg build terraform-full` |
||||
branch: terraform-providers-update |
||||
delete-branch: false |
||||
labels: "2.status: work-in-progress" |
||||
title: ${{ steps.setup.outputs.title }} |
||||
token: ${{ secrets.GITHUB_TOKEN }} |
||||
- name: comment on failure |
||||
uses: peter-evans/create-or-update-comment@v1 |
||||
if: ${{ failure() }} |
||||
with: |
||||
issue-number: 153416 |
||||
body: | |
||||
Automatic update of terraform providers [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}). |
||||
@ -1,17 +1,37 @@ |
||||
# pkgs.mkShell {#sec-pkgs-mkShell} |
||||
|
||||
`pkgs.mkShell` is a special kind of derivation that is only useful when using |
||||
it combined with `nix-shell`. It will in fact fail to instantiate when invoked |
||||
with `nix-build`. |
||||
`pkgs.mkShell` is a specialized `stdenv.mkDerivation` that removes some |
||||
repetition when using it with `nix-shell` (or `nix develop`). |
||||
|
||||
## Usage {#sec-pkgs-mkShell-usage} |
||||
|
||||
Here is a common usage example: |
||||
|
||||
```nix |
||||
{ pkgs ? import <nixpkgs> {} }: |
||||
pkgs.mkShell { |
||||
# specify which packages to add to the shell environment |
||||
packages = [ pkgs.gnumake ]; |
||||
# add all the dependencies, of the given packages, to the shell environment |
||||
inputsFrom = with pkgs; [ hello gnutar ]; |
||||
|
||||
inputsFrom = [ pkgs.hello pkgs.gnutar ]; |
||||
|
||||
shellHook = '' |
||||
export DEBUG=1 |
||||
''; |
||||
} |
||||
``` |
||||
|
||||
## Attributes |
||||
|
||||
* `name` (default: `nix-shell`). Set the name of the derivation. |
||||
* `packages` (default: `[]`). Add executable packages to the `nix-shell` environment. |
||||
* `inputsFrom` (default: `[]`). Add build dependencies of the listed derivations to the `nix-shell` environment. |
||||
* `shellHook` (default: `""`). Bash statements that are executed by `nix-shell`. |
||||
|
||||
... all the attributes of `stdenv.mkDerivation`. |
||||
|
||||
## Building the shell |
||||
|
||||
This derivation output will contain a text file that contains a reference to |
||||
all the build inputs. This is useful in CI where we want to make sure that |
||||
every derivation, and its dependencies, build properly. Or when creating a GC |
||||
root so that the build dependencies don't get garbage-collected. |
||||
|
||||
@ -0,0 +1,14 @@ |
||||
{ lib, ... }: { |
||||
options.dummy = lib.mkOption { type = lib.types.anything; default = {}; }; |
||||
freeformType = |
||||
let |
||||
a = lib.types.attrsOf (lib.types.submodule { options.bar = lib.mkOption { }; }); |
||||
in |
||||
# modifying types like this breaks type merging. |
||||
# This test makes sure that type merging is not performed when only a single declaration exists. |
||||
# Don't modify types in practice! |
||||
a // { |
||||
merge = loc: defs: { freeformItems = a.merge loc defs; }; |
||||
}; |
||||
config.foo.bar = "ok"; |
||||
} |
||||
@ -0,0 +1,10 @@ |
||||
{ lib, ... }: |
||||
let |
||||
inherit (lib) mkOption types; |
||||
in |
||||
{ |
||||
options.bare-submodule.deep = mkOption { |
||||
type = types.int; |
||||
default = 2; |
||||
}; |
||||
} |
||||
@ -0,0 +1,10 @@ |
||||
{ lib, ... }: |
||||
let |
||||
inherit (lib) mkOption types; |
||||
in |
||||
{ |
||||
options.bare-submodule.deep = mkOption { |
||||
type = types.int; |
||||
default = 2; |
||||
}; |
||||
} |
||||
@ -0,0 +1,19 @@ |
||||
{ config, lib, ... }: |
||||
let |
||||
inherit (lib) mkOption types; |
||||
in |
||||
{ |
||||
options.bare-submodule = mkOption { |
||||
type = types.submoduleWith { |
||||
shorthandOnlyDefinesConfig = config.shorthandOnlyDefinesConfig; |
||||
modules = [ |
||||
{ |
||||
options.nested = mkOption { |
||||
type = types.int; |
||||
default = 1; |
||||
}; |
||||
} |
||||
]; |
||||
}; |
||||
}; |
||||
} |
||||
@ -0,0 +1,18 @@ |
||||
{ config, lib, ... }: |
||||
let |
||||
inherit (lib) mkOption types; |
||||
in |
||||
{ |
||||
options.bare-submodule = mkOption { |
||||
type = types.submoduleWith { |
||||
modules = [ ]; |
||||
shorthandOnlyDefinesConfig = config.shorthandOnlyDefinesConfig; |
||||
}; |
||||
default = {}; |
||||
}; |
||||
|
||||
# config-dependent options: won't recommend, but useful for making this test parameterized |
||||
options.shorthandOnlyDefinesConfig = mkOption { |
||||
default = false; |
||||
}; |
||||
} |
||||
@ -0,0 +1,12 @@ |
||||
{ lib, ... }: |
||||
|
||||
{ |
||||
options.set = lib.mkOption { |
||||
default = { }; |
||||
example = { a = 1; }; |
||||
type = lib.types.attrsOf lib.types.int; |
||||
description = '' |
||||
Some descriptive text |
||||
''; |
||||
}; |
||||
} |
||||
@ -0,0 +1,4 @@ |
||||
{ |
||||
bare-submodule.nested = 42; |
||||
bare-submodule.deep = 420; |
||||
} |
||||
@ -0,0 +1 @@ |
||||
{ shorthandOnlyDefinesConfig = true; } |
||||
@ -0,0 +1,36 @@ |
||||
{ lib, ... }: |
||||
let |
||||
inherit (lib) types; |
||||
in { |
||||
|
||||
options = { |
||||
int = lib.mkOption { |
||||
type = types.lazyAttrsOf types.int; |
||||
}; |
||||
list = lib.mkOption { |
||||
type = types.lazyAttrsOf (types.listOf types.int); |
||||
}; |
||||
nonEmptyList = lib.mkOption { |
||||
type = types.lazyAttrsOf (types.nonEmptyListOf types.int); |
||||
}; |
||||
attrs = lib.mkOption { |
||||
type = types.lazyAttrsOf (types.attrsOf types.int); |
||||
}; |
||||
null = lib.mkOption { |
||||
type = types.lazyAttrsOf (types.nullOr types.int); |
||||
}; |
||||
submodule = lib.mkOption { |
||||
type = types.lazyAttrsOf (types.submodule {}); |
||||
}; |
||||
}; |
||||
|
||||
config = { |
||||
int.a = lib.mkIf false null; |
||||
list.a = lib.mkIf false null; |
||||
nonEmptyList.a = lib.mkIf false null; |
||||
attrs.a = lib.mkIf false null; |
||||
null.a = lib.mkIf false null; |
||||
submodule.a = lib.mkIf false null; |
||||
}; |
||||
|
||||
} |
||||
@ -0,0 +1,22 @@ |
||||
{ lib, options, ... }: with lib.types; { |
||||
|
||||
options.fooDeclarations = lib.mkOption { |
||||
default = (options.free.type.getSubOptions [])._freeformOptions.foo.declarations; |
||||
}; |
||||
|
||||
options.free = lib.mkOption { |
||||
type = submodule { |
||||
config._module.freeformType = lib.mkMerge [ |
||||
(attrsOf (submodule { |
||||
options.foo = lib.mkOption {}; |
||||
})) |
||||
(attrsOf (submodule { |
||||
options.bar = lib.mkOption {}; |
||||
})) |
||||
]; |
||||
}; |
||||
}; |
||||
|
||||
config.free.xxx.foo = 10; |
||||
config.free.yyy.bar = 10; |
||||
} |
||||
@ -0,0 +1,28 @@ |
||||
{ config, lib, ... }: { |
||||
|
||||
_file = "optionTypeFile.nix"; |
||||
|
||||
options.theType = lib.mkOption { |
||||
type = lib.types.optionType; |
||||
}; |
||||
|
||||
options.theOption = lib.mkOption { |
||||
type = config.theType; |
||||
default = {}; |
||||
}; |
||||
|
||||
config.theType = lib.mkMerge [ |
||||
(lib.types.submodule { |
||||
options.nested = lib.mkOption { |
||||
type = lib.types.int; |
||||
}; |
||||
}) |
||||
(lib.types.submodule { |
||||
_file = "other.nix"; |
||||
options.nested = lib.mkOption { |
||||
type = lib.types.str; |
||||
}; |
||||
}) |
||||
]; |
||||
|
||||
} |
||||
@ -0,0 +1,27 @@ |
||||
{ config, lib, ... }: { |
||||
|
||||
options.theType = lib.mkOption { |
||||
type = lib.types.optionType; |
||||
}; |
||||
|
||||
options.theOption = lib.mkOption { |
||||
type = config.theType; |
||||
}; |
||||
|
||||
config.theType = lib.mkMerge [ |
||||
(lib.types.submodule { |
||||
options.int = lib.mkOption { |
||||
type = lib.types.int; |
||||
default = 10; |
||||
}; |
||||
}) |
||||
(lib.types.submodule { |
||||
options.str = lib.mkOption { |
||||
type = lib.types.str; |
||||
}; |
||||
}) |
||||
]; |
||||
|
||||
config.theOption.str = "hello"; |
||||
|
||||
} |
||||
@ -0,0 +1,30 @@ |
||||
{ lib, ... }: { |
||||
|
||||
options = { |
||||
processedToplevel = lib.mkOption { |
||||
type = lib.types.raw; |
||||
}; |
||||
unprocessedNesting = lib.mkOption { |
||||
type = lib.types.raw; |
||||
}; |
||||
multiple = lib.mkOption { |
||||
type = lib.types.raw; |
||||
}; |
||||
priorities = lib.mkOption { |
||||
type = lib.types.raw; |
||||
}; |
||||
}; |
||||
|
||||
config = { |
||||
processedToplevel = lib.mkIf true 10; |
||||
unprocessedNesting.foo = throw "foo"; |
||||
multiple = lib.mkMerge [ |
||||
"foo" |
||||
"foo" |
||||
]; |
||||
priorities = lib.mkMerge [ |
||||
"foo" |
||||
(lib.mkForce "bar") |
||||
]; |
||||
}; |
||||
} |
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,136 @@ |
||||
/* Nix expression to test for regressions in the Haskell configuration overlays. |
||||
|
||||
test-configurations.nix determines all attributes touched by given Haskell |
||||
configuration overlays (i. e. pkgs/development/haskell-modules/configuration-*.nix) |
||||
and builds all derivations (or at least a reasonable subset) affected by |
||||
these overrides. |
||||
|
||||
By default, it checks `configuration-{common,nix,ghc-8.10.x}.nix`. You can |
||||
invoke it like this: |
||||
|
||||
nix-build maintainers/scripts/haskell/test-configurations.nix --keep-going |
||||
|
||||
It is possible to specify other configurations: |
||||
|
||||
nix-build maintainers/scripts/haskell/test-configurations.nix \ |
||||
--arg files '[ "configuration-ghc-9.0.x.nix" "configuration-ghc-9.2.x.nix" ]' \ |
||||
--keep-going |
||||
|
||||
You can also just supply a single string: |
||||
|
||||
nix-build maintainers/scripts/haskell/test-configurations.nix \ |
||||
--argstr files "configuration-arm.nix" --keep-going |
||||
|
||||
You can even supply full paths which is handy, as it allows for tab-completing |
||||
the configurations: |
||||
|
||||
nix-build maintainers/scripts/haskell/test-configurations.nix \ |
||||
--argstr files pkgs/development/haskell-modules/configuration-arm.nix \ |
||||
--keep-going |
||||
|
||||
By default, derivation that fail to evaluate are skipped, unless they are |
||||
“just” marked as broken. You can check for other eval errors like this: |
||||
|
||||
nix-build maintainers/scripts/haskell/test-configurations.nix \ |
||||
--arg skipEvalErrors false --keep-going |
||||
|
||||
You can also disable checking broken packages by passing a nixpkgs config: |
||||
|
||||
nix-build maintainers/scripts/haskell/test-configurations.nix \ |
||||
--arg config '{ allowBroken = false; }' --keep-going |
||||
|
||||
By default the haskell.packages.ghc*Binary sets used for bootstrapping GHC |
||||
are _not_ tested. You can change this using: |
||||
|
||||
nix-build maintainers/scripts/haskell/test-configurations.nix \ |
||||
--arg skipBinaryGHCs false --keep-going |
||||
|
||||
*/ |
||||
{ files ? [ |
||||
"configuration-common.nix" |
||||
"configuration-nix.nix" |
||||
"configuration-ghc-8.10.x.nix" |
||||
] |
||||
, nixpkgsPath ? ../../.. |
||||
, config ? { allowBroken = true; } |
||||
, skipEvalErrors ? true |
||||
, skipBinaryGHCs ? true |
||||
}: |
||||
|
||||
let |
||||
pkgs = import nixpkgsPath { inherit config; }; |
||||
inherit (pkgs) lib; |
||||
|
||||
# see usage explanation for the input format `files` allows |
||||
files' = builtins.map builtins.baseNameOf ( |
||||
if !builtins.isList files then [ files ] else files |
||||
); |
||||
|
||||
setsForFile = fileName: |
||||
let |
||||
# extract the unique part of the config's file name |
||||
configName = builtins.head ( |
||||
builtins.match "configuration-(.+).nix" fileName |
||||
); |
||||
# match the major and minor version of the GHC the config is intended for, if any |
||||
configVersion = lib.concatStrings ( |
||||
builtins.match "ghc-([0-9]+).([0-9]+).x" configName |
||||
); |
||||
# return all package sets under haskell.packages matching the version components |
||||
setsForVersion = builtins.map (name: pkgs.haskell.packages.${name}) ( |
||||
builtins.filter (setName: |
||||
lib.hasPrefix "ghc${configVersion}" setName |
||||
&& (skipBinaryGHCs -> !(lib.hasInfix "Binary" setName)) |
||||
) ( |
||||
builtins.attrNames pkgs.haskell.packages |
||||
) |
||||
); |
||||
|
||||
defaultSets = [ pkgs.haskellPackages ]; |
||||
in { |
||||
# use plain haskellPackages for the version-agnostic files |
||||
# TODO(@sternenseemann): also consider currently selected versioned sets |
||||
"common" = defaultSets; |
||||
"nix" = defaultSets; |
||||
"arm" = defaultSets; |
||||
"darwin" = defaultSets; |
||||
}.${configName} or setsForVersion; |
||||
|
||||
# attribute set that has all the attributes of haskellPackages set to null |
||||
availableHaskellPackages = builtins.listToAttrs ( |
||||
builtins.map (attr: lib.nameValuePair attr null) ( |
||||
builtins.attrNames pkgs.haskellPackages |
||||
) |
||||
); |
||||
|
||||
# evaluate a configuration and only return the attributes changed by it, |
||||
# pass availableHaskellPackages as super in case intersectAttrs is used |
||||
overriddenAttrs = fileName: builtins.attrNames ( |
||||
lib.fix (self: |
||||
import (nixpkgsPath + "/pkgs/development/haskell-modules/${fileName}") { |
||||
haskellLib = pkgs.haskell.lib.compose; |
||||
inherit pkgs; |
||||
} self availableHaskellPackages |
||||
) |
||||
); |
||||
|
||||
# list of derivations that are affected by overrides in the given configuration |
||||
# overlays. For common, nix, darwin etc. only the derivation from the default |
||||
# package set will be emitted. |
||||
packages = builtins.filter (v: |
||||
lib.warnIf (v.meta.broken or false) "${v.pname} is marked as broken" ( |
||||
v != null |
||||
&& (skipEvalErrors -> (builtins.tryEval (v.outPath or v)).success) |
||||
) |
||||
) ( |
||||
lib.concatMap (fileName: |
||||
let |
||||
sets = setsForFile fileName; |
||||
attrs = overriddenAttrs fileName; |
||||
in |
||||
lib.concatMap (set: builtins.map (attr: set.${attr}) attrs) sets |
||||
) files' |
||||
); |
||||
in |
||||
|
||||
packages |
||||
|
@ -0,0 +1,202 @@ |
||||
#!/usr/bin/env nix-shell |
||||
#!nix-shell -i python3 -p "python3.withPackages(ps: with ps; [ ])" nix |
||||
""" |
||||
A program to remove old aliases or convert old aliases to throws |
||||
Example usage: |
||||
./maintainers/scripts/remove-old-aliases.py --year 2018 --file ./pkgs/top-level/aliases.nix |
||||
|
||||
Check this file with mypy after every change! |
||||
$ mypy --strict maintainers/scripts/remove-old-aliases.py |
||||
""" |
||||
import argparse |
||||
import shutil |
||||
import subprocess |
||||
from datetime import date as datetimedate |
||||
from datetime import datetime |
||||
from pathlib import Path |
||||
|
||||
|
||||
def process_args() -> argparse.Namespace: |
||||
"""process args""" |
||||
arg_parser = argparse.ArgumentParser() |
||||
arg_parser.add_argument( |
||||
"--year", required=True, type=int, help="operate on aliases older than $year" |
||||
) |
||||
arg_parser.add_argument( |
||||
"--month", |
||||
type=int, |
||||
default=1, |
||||
help="operate on aliases older than $year-$month", |
||||
) |
||||
arg_parser.add_argument("--file", required=True, type=Path, help="alias file") |
||||
arg_parser.add_argument( |
||||
"--dry-run", action="store_true", help="don't modify files, only print results" |
||||
) |
||||
return arg_parser.parse_args() |
||||
|
||||
|
||||
def get_date_lists( |
||||
txt: list[str], cutoffdate: datetimedate |
||||
) -> tuple[list[str], list[str], list[str]]: |
||||
"""get a list of lines in which the date is older than $cutoffdate""" |
||||
date_older_list: list[str] = [] |
||||
date_older_throw_list: list[str] = [] |
||||
date_sep_line_list: list[str] = [] |
||||
|
||||
for lineno, line in enumerate(txt, start=1): |
||||
line = line.rstrip() |
||||
my_date = None |
||||
for string in line.split(): |
||||
string = string.strip(":") |
||||
try: |
||||
# strip ':' incase there is a string like 2019-11-01: |
||||
my_date = datetime.strptime(string, "%Y-%m-%d").date() |
||||
except ValueError: |
||||
try: |
||||
my_date = datetime.strptime(string, "%Y-%m").date() |
||||
except ValueError: |
||||
continue |
||||
|
||||
if my_date is None or my_date > cutoffdate: |
||||
continue |
||||
|
||||
if "=" not in line: |
||||
date_sep_line_list.append(f"{lineno} {line}") |
||||
# 'if' lines could be complicated |
||||
elif "if " in line and "if =" not in line: |
||||
print(f"RESOLVE MANUALLY {line}") |
||||
elif "throw" in line: |
||||
date_older_throw_list.append(line) |
||||
else: |
||||
date_older_list.append(line) |
||||
|
||||
return ( |
||||
date_older_list, |
||||
date_sep_line_list, |
||||
date_older_throw_list, |
||||
) |
||||
|
||||
|
||||
def convert_to_throw(date_older_list: list[str]) -> list[tuple[str, str]]: |
||||
"""convert a list of lines to throws""" |
||||
converted_list = [] |
||||
for line in date_older_list.copy(): |
||||
indent: str = " " * (len(line) - len(line.lstrip())) |
||||
before_equal = "" |
||||
after_equal = "" |
||||
try: |
||||
before_equal, after_equal = (x.strip() for x in line.split("=", maxsplit=2)) |
||||
except ValueError as err: |
||||
print(err, line, "\n") |
||||
date_older_list.remove(line) |
||||
continue |
||||
|
||||
alias = before_equal.strip() |
||||
after_equal_list = [x.strip(";:") for x in after_equal.split()] |
||||
|
||||
converted = ( |
||||
f"{indent}{alias} = throw \"'{alias}' has been renamed to/replaced by" |
||||
f" '{after_equal_list.pop(0)}'\";" |
||||
f' # Converted to throw {datetime.today().strftime("%Y-%m-%d")}' |
||||
) |
||||
converted_list.append((line, converted)) |
||||
|
||||
return converted_list |
||||
|
||||
|
||||
def generate_text_to_write( |
||||
txt: list[str], |
||||
date_older_list: list[str], |
||||
converted_to_throw: list[tuple[str, str]], |
||||
date_older_throw_list: list[str], |
||||
) -> list[str]: |
||||
"""generate a list of text to be written to the aliasfile""" |
||||
text_to_write: list[str] = [] |
||||
for line in txt: |
||||
text_to_append: str = "" |
||||
if converted_to_throw: |
||||
for tupl in converted_to_throw: |
||||
if line == tupl[0]: |
||||
text_to_append = f"{tupl[1]}\n" |
||||
if line not in date_older_list and line not in date_older_throw_list: |
||||
text_to_append = f"{line}\n" |
||||
if text_to_append: |
||||
text_to_write.append(text_to_append) |
||||
|
||||
return text_to_write |
||||
|
||||
|
||||
def write_file( |
||||
aliasfile: Path, |
||||
text_to_write: list[str], |
||||
) -> None: |
||||
"""write file""" |
||||
temp_aliasfile = Path(f"{aliasfile}.raliases") |
||||
with open(temp_aliasfile, "w", encoding="utf-8") as far: |
||||
for line in text_to_write: |
||||
far.write(line) |
||||
print("\nChecking the syntax of the new aliasfile") |
||||
try: |
||||
subprocess.run( |
||||
["nix-instantiate", "--eval", temp_aliasfile], |
||||
check=True, |
||||
stdout=subprocess.DEVNULL, |
||||
) |
||||
except subprocess.CalledProcessError: |
||||
print( |
||||
"\nSyntax check failed,", |
||||
"there may have been a line which only has\n" |
||||
'aliasname = "reason why";\n' |
||||
"when it should have been\n" |
||||
'aliasname = throw "reason why";', |
||||
) |
||||
temp_aliasfile.unlink() |
||||
return |
||||
shutil.move(f"{aliasfile}.raliases", aliasfile) |
||||
print(f"{aliasfile} modified! please verify with 'git diff'.") |
||||
|
||||
|
||||
def main() -> None: |
||||
"""main""" |
||||
args = process_args() |
||||
|
||||
aliasfile = Path(args.file).absolute() |
||||
cutoffdate = (datetime.strptime(f"{args.year}-{args.month}-01", "%Y-%m-%d")).date() |
||||
|
||||
txt: list[str] = (aliasfile.read_text(encoding="utf-8")).splitlines() |
||||
|
||||
date_older_list: list[str] = [] |
||||
date_sep_line_list: list[str] = [] |
||||
date_older_throw_list: list[str] = [] |
||||
|
||||
date_older_list, date_sep_line_list, date_older_throw_list = get_date_lists( |
||||
txt, cutoffdate |
||||
) |
||||
|
||||
converted_to_throw: list[tuple[str, str]] = [] |
||||
converted_to_throw = convert_to_throw(date_older_list) |
||||
|
||||
if date_older_list: |
||||
print(" Will be converted to throws. ".center(100, "-")) |
||||
for l_n in date_older_list: |
||||
print(l_n) |
||||
|
||||
if date_older_throw_list: |
||||
print(" Will be removed. ".center(100, "-")) |
||||
for l_n in date_older_throw_list: |
||||
print(l_n) |
||||
|
||||
if date_sep_line_list: |
||||
print(" On separate line, resolve manually. ".center(100, "-")) |
||||
for l_n in date_sep_line_list: |
||||
print(l_n) |
||||
|
||||
if not args.dry_run: |
||||
text_to_write = generate_text_to_write( |
||||
txt, date_older_list, converted_to_throw, date_older_throw_list |
||||
) |
||||
write_file(aliasfile, text_to_write) |
||||
|
||||
|
||||
if __name__ == "__main__": |
||||
main() |
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue