Skip to content

Commit

Permalink
Merge pull request #952 from kamadorueda/main
Browse files Browse the repository at this point in the history
refac(conf): #919 simplify licensing
  • Loading branch information
kamadorueda authored Oct 4, 2022
2 parents b97d652 + 894e01a commit ba5e0cd
Show file tree
Hide file tree
Showing 71 changed files with 139 additions and 103 deletions.
4 changes: 4 additions & 0 deletions .gitlab-ci.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
/helloWorld__1__2__3:
image: ghcr.io/fluidattacks/makes:22.11
Expand Down
3 changes: 0 additions & 3 deletions .gitlab-ci.yaml.license

This file was deleted.

1 change: 1 addition & 0 deletions docs/book.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

[book]
authors = ["Fluid Attacks"]
language = "en"
Expand Down
4 changes: 4 additions & 0 deletions makes/cli/env/runtime/pypi/pypi-deps.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
rich: '*'
textual: '*'
3 changes: 0 additions & 3 deletions makes/cli/env/runtime/pypi/pypi-deps.yaml.license

This file was deleted.

4 changes: 4 additions & 0 deletions makes/cli/env/runtime/pypi/pypi-sources.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

closure:
commonmark: 0.9.1
pygments: 2.13.0
Expand Down
3 changes: 0 additions & 3 deletions makes/cli/env/runtime/pypi/pypi-sources.yaml.license

This file was deleted.

4 changes: 4 additions & 0 deletions makes/cli/env/test/pypi-deps.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
pytest: '*'
pytest-cov: '*'
3 changes: 0 additions & 3 deletions makes/cli/env/test/pypi-deps.yaml.license

This file was deleted.

4 changes: 4 additions & 0 deletions makes/cli/env/test/pypi-sources.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

closure:
attrs: 22.1.0
colorama: 0.4.5
Expand Down
3 changes: 0 additions & 3 deletions makes/cli/env/test/pypi-sources.yaml.license

This file was deleted.

2 changes: 2 additions & 0 deletions makes/license/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ function main {
[sh]=python
[tf]=python
[toml]=python
[yaml]=python
[yml]=python
)

: \
Expand Down
1 change: 0 additions & 1 deletion makes/tests/calculateCvss3/main.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT
# /path/to/my/project/makes/example/main.nix
{calculateCvss3, ...}:
calculateCvss3
(builtins.concatStringsSep "" [
Expand Down
4 changes: 4 additions & 0 deletions makes/tests/makeTemplate/test.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
testTitle: >-
! # $ % & ' ( ) * + , - . /
Expand Down
3 changes: 0 additions & 3 deletions makes/tests/makeTemplate/test.yaml.license

This file was deleted.

4 changes: 4 additions & 0 deletions makes/tests/secretsForGpgFromEnv/secrets.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
secret: ENC[AES256_GCM,data:KOuR,iv:Z1uEWs6+N4O10CpUOregxx6ejQidoAIHuFeJA+3RwE4=,tag:eKkb91u4ueSYd4cXZ4uFJg==,type:int]
sops:
Expand Down
3 changes: 0 additions & 3 deletions makes/tests/secretsForGpgFromEnv/secrets.yaml.license

This file was deleted.

4 changes: 4 additions & 0 deletions makes/utils/makeSopsEncryptedFile/template.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
test_key: test_value
3 changes: 0 additions & 3 deletions makes/utils/makeSopsEncryptedFile/template.yaml.license

This file was deleted.

4 changes: 4 additions & 0 deletions src/args/calculate-cvss-3/dependencies.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
cvss: '2.3'
3 changes: 0 additions & 3 deletions src/args/calculate-cvss-3/dependencies.yaml.license

This file was deleted.

4 changes: 4 additions & 0 deletions src/args/calculate-cvss-3/sources.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
closure:
cvss: '2.3'
Expand Down
3 changes: 0 additions & 3 deletions src/args/calculate-cvss-3/sources.yaml.license

This file was deleted.

4 changes: 4 additions & 0 deletions src/args/format-yaml/dependencies.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
yamlfix: 0.10.0
3 changes: 0 additions & 3 deletions src/args/format-yaml/dependencies.yaml.license

This file was deleted.

4 changes: 4 additions & 0 deletions src/args/format-yaml/sources.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
closure:
click: 8.1.3
Expand Down
3 changes: 0 additions & 3 deletions src/args/format-yaml/sources.yaml.license

This file was deleted.

4 changes: 4 additions & 0 deletions src/args/lint-python-imports/pypi-deps.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
import-linter: 1.2.4
3 changes: 0 additions & 3 deletions src/args/lint-python-imports/pypi-deps.yaml.license

This file was deleted.

4 changes: 4 additions & 0 deletions src/args/lint-python-imports/pypi-sources.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
closure:
click: 8.0.1
Expand Down
3 changes: 0 additions & 3 deletions src/args/lint-python-imports/pypi-sources.yaml.license

This file was deleted.

4 changes: 4 additions & 0 deletions src/args/lint-python/pypi-deps.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
mypy: '0.971'
prospector: 1.5.1
Expand Down
3 changes: 0 additions & 3 deletions src/args/lint-python/pypi-deps.yaml.license

This file was deleted.

4 changes: 4 additions & 0 deletions src/args/lint-python/pypi-sources-3.10.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
closure:
astroid: 2.8.6
Expand Down
3 changes: 0 additions & 3 deletions src/args/lint-python/pypi-sources-3.10.yaml.license

This file was deleted.

4 changes: 4 additions & 0 deletions src/args/lint-python/pypi-sources-3.7.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
closure:
astroid: 2.8.6
Expand Down
3 changes: 0 additions & 3 deletions src/args/lint-python/pypi-sources-3.7.yaml.license

This file was deleted.

4 changes: 4 additions & 0 deletions src/args/lint-python/pypi-sources-3.8.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
closure:
astroid: 2.8.6
Expand Down
3 changes: 0 additions & 3 deletions src/args/lint-python/pypi-sources-3.8.yaml.license

This file was deleted.

4 changes: 4 additions & 0 deletions src/args/lint-python/pypi-sources-3.9.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
closure:
astroid: 2.8.6
Expand Down
3 changes: 0 additions & 3 deletions src/args/lint-python/pypi-sources-3.9.yaml.license

This file was deleted.

4 changes: 4 additions & 0 deletions src/args/lint-with-lizard/dependencies.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
lizard: 1.17.3
3 changes: 0 additions & 3 deletions src/args/lint-with-lizard/dependencies.yaml.license

This file was deleted.

4 changes: 4 additions & 0 deletions src/args/lint-with-lizard/sources.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
closure:
lizard: 1.17.3
Expand Down
3 changes: 0 additions & 3 deletions src/args/lint-with-lizard/sources.yaml.license

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
numpy: 1.21.2

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
closure:
numpy: 1.21.2
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
closure:
numpy: 1.21.2
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
closure:
numpy: 1.21.2
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
closure:
numpy: 1.21.2
Expand Down

This file was deleted.

4 changes: 4 additions & 0 deletions src/args/test-python/pypi-deps.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
pytest: '*'
3 changes: 0 additions & 3 deletions src/args/test-python/pypi-deps.yaml.license

This file was deleted.

4 changes: 4 additions & 0 deletions src/args/test-python/pypi-sources-3.10.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

closure:
atomicwrites: 1.4.1
attrs: 22.1.0
Expand Down
4 changes: 4 additions & 0 deletions src/args/test-python/pypi-sources-3.7.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
closure:
atomicwrites: 1.4.0
Expand Down
3 changes: 0 additions & 3 deletions src/args/test-python/pypi-sources-3.7.yaml.license

This file was deleted.

4 changes: 4 additions & 0 deletions src/args/test-python/pypi-sources-3.8.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
#
# SPDX-License-Identifier: MIT

---
closure:
atomicwrites: 1.4.0
Expand Down
Loading

0 comments on commit ba5e0cd

Please sign in to comment.