Skip to content

Commit

Permalink
Merge pull request #240 from maresb/vendor-poetry
Browse files Browse the repository at this point in the history
  • Loading branch information
mariusvniekerk authored Oct 10, 2022
2 parents 2811502 + 75ad80b commit 9870b27
Show file tree
Hide file tree
Showing 313 changed files with 59,218 additions and 94 deletions.
5 changes: 5 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
* text eol=lf
*.patch binary
*.bat binary
*.exe binary
*.ico binary
# Treat vendor folder as vendored and generated
conda_lock/_vendor/** linguist-vendored linguist-generated
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ repos:
rev: v4.1.0
hooks:
- id: trailing-whitespace
exclude: "^.*\\.patch$"
- id: check-ast

- repo: https://github.com/psf/black
Expand Down
17 changes: 15 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,24 @@ SOFTWARE.

---

Conda-lock incorporates the following libraries into its distributed code:
Conda-lock incorporates the following libraries, sometimes with modification,
into its distributed code:

* conda, license as BSD-3-Clause
* conda, licensed as BSD-3-Clause
* auxlib, licensed as ISC
* boltons, licensed as BSD-3-Clause
* pytoolz, licensed as BSD-3-Clause
* tqdm, licensed as MIT
* urllib3, licensed as MIT
* cleo v0.8.1, licensed as MIT.
* poetry v1.1.15, licensed as MIT.
* poetry-core v1.0.8, licensed as MIT.
* attrs v20.3.0, licensed as MIT.
* jsonschema v3.2.0, licensed as MIT.
* lark-parser v0.9.0, licensed as MIT.
* packaging v20.9, licensed as Apache-2.0 or BSD-2-Clause.
* pyparsing v2.4.7, licensed as MIT.
* pyrsistent v0.16.1, licensed as MIT.
* tomlkit v0.7.0, licensed as MIT.

For more detailed information, please refer to conda_lock/_vendor/LICENSES.md
25 changes: 25 additions & 0 deletions conda_lock/_vendor/LICENSES.md

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

9 changes: 8 additions & 1 deletion conda_lock/_vendor/README.md

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

20 changes: 20 additions & 0 deletions conda_lock/_vendor/cleo.LICENSE

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

1 change: 1 addition & 0 deletions conda_lock/_vendor/cleo.pyi

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

20 changes: 20 additions & 0 deletions conda_lock/_vendor/cleo/LICENSE

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

112 changes: 112 additions & 0 deletions conda_lock/_vendor/cleo/io/io_mixin.py

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

29 changes: 4 additions & 25 deletions conda_lock/_vendor/conda/LICENSE.txt

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

58 changes: 29 additions & 29 deletions conda_lock/_vendor/conda/_vendor/boltons/LICENSE

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

2 changes: 1 addition & 1 deletion conda_lock/_vendor/conda/_vendor/cpuinfo/__init__.py

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

2 changes: 1 addition & 1 deletion conda_lock/_vendor/conda/core/index.py

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

Loading

0 comments on commit 9870b27

Please sign in to comment.