From c66608f8425a9736a10d8c32fe7a08e7e13a6df3 Mon Sep 17 00:00:00 2001 From: Torsten Kilias Date: Fri, 15 Dec 2023 08:04:49 +0100 Subject: [PATCH] #864: Added Python 3.10 template flavor (#865) * Use baselisk to run test in check_bazel_tests.yml to pin the bazel version to pre 7.0.0. bazel 7.0.0 seems to break the build at the moment. Co-authored-by: Christoph Pirkl --- .current_gitmodules | 2 +- aws-code-build/ci/buildspec.yaml | 7 + aws-code-build/release/buildspec.yaml | 7 + doc/changes/changes_7.1.0.md | 9 +- doc/changes/package_diffs/7.1.0/README.md | 1 + .../README.md | 17 ++ .../base_test_deps/apt_get_packages_diff.md | 10 + .../build_deps/apt_get_packages_diff.md | 13 + .../flavor_base_deps/apt_get_packages_diff.md | 8 + .../python3_pip_packages_diff.md | 4 + .../language_deps/apt_get_packages_diff.md | 9 + .../python3_pip_packages_diff.md | 7 + .../security_scan/apt_get_packages_diff.md | 5 + .../apt_get_packages_trivy_deps_diff.md | 6 + .../udfclient_deps/apt_get_packages_diff.md | 10 + flavors/README.md | 18 +- flavors/template-Exasol-all-python-3.10 | 1 + poetry.lock | 224 +++--------------- script-languages | 2 +- 19 files changed, 153 insertions(+), 207 deletions(-) create mode 100644 doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/README.md create mode 100644 doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/base_test_deps/apt_get_packages_diff.md create mode 100644 doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/build_deps/apt_get_packages_diff.md create mode 100644 doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/flavor_base_deps/apt_get_packages_diff.md create mode 100644 doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/flavor_base_deps/python3_pip_packages_diff.md create mode 100644 doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/language_deps/apt_get_packages_diff.md create mode 100644 doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/language_deps/python3_pip_packages_diff.md create mode 100644 doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/security_scan/apt_get_packages_diff.md create mode 100644 doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/security_scan/apt_get_packages_trivy_deps_diff.md create mode 100644 doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/udfclient_deps/apt_get_packages_diff.md create mode 120000 flavors/template-Exasol-all-python-3.10 diff --git a/.current_gitmodules b/.current_gitmodules index d13cc8c3..3f5980cc 100644 --- a/.current_gitmodules +++ b/.current_gitmodules @@ -1 +1 @@ -160000 aa5e0063387bf1ee8577040b7e70063516b0256e 0 script-languages +160000 869091028486599c81e3fa969ee5284227efac3c 0 script-languages diff --git a/aws-code-build/ci/buildspec.yaml b/aws-code-build/ci/buildspec.yaml index a83ec57d..e150b66f 100644 --- a/aws-code-build/ci/buildspec.yaml +++ b/aws-code-build/ci/buildspec.yaml @@ -34,6 +34,13 @@ batch: compute-type: BUILD_GENERAL1_MEDIUM privileged-mode: true buildspec: ./aws-code-build/ci/build_buildspec.yaml + - identifier: build_template_Exasol_all_python_310 + env: + variables: + FLAVOR: template-Exasol-all-python-3.10 + compute-type: BUILD_GENERAL1_MEDIUM + privileged-mode: true + buildspec: ./aws-code-build/ci/build_buildspec.yaml - identifier: build_template_Exasol_all_python_38_conda env: variables: diff --git a/aws-code-build/release/buildspec.yaml b/aws-code-build/release/buildspec.yaml index 817ce1b3..ef0fd65b 100644 --- a/aws-code-build/release/buildspec.yaml +++ b/aws-code-build/release/buildspec.yaml @@ -34,6 +34,13 @@ batch: compute-type: BUILD_GENERAL1_MEDIUM privileged-mode: true buildspec: ./aws-code-build/release/build_buildspec.yaml + - identifier: build_template_Exasol_all_python_310 + env: + variables: + FLAVOR: template-Exasol-all-python-3.10 + compute-type: BUILD_GENERAL1_MEDIUM + privileged-mode: true + buildspec: ./aws-code-build/release/build_buildspec.yaml - identifier: build_template_Exasol_all_python_38_conda env: variables: diff --git a/doc/changes/changes_7.1.0.md b/doc/changes/changes_7.1.0.md index 2429f0b2..6c70dd7c 100644 --- a/doc/changes/changes_7.1.0.md +++ b/doc/changes/changes_7.1.0.md @@ -1,10 +1,10 @@ -# script-languages-release 7.0.0, released t.b.d +# script-languages-release 7.1.0, released 2023-12-15 -Code name: t.b.d +Code name: Template flavor with Python 3.10 support ## Summary -t.b.d +This release added a new template flavor with Python 3.10 and updated packages. ## [Package Version Comparison between Release 7.0.0 and 7.1.0](package_diffs/7.1.0/README.md) @@ -19,6 +19,7 @@ n/a ## Features / Enhancements n/a +- #861: Added flavor template-Exasol-all-python-3.10 with Python 3.10 support ## Documentation @@ -32,7 +33,7 @@ n/a - #861: Updated Packages and ignore CVE-2023-6176, because it only effects the Kernel -Attention: The CVE's bellow can't be fixed by the container itself, rather need to be addressed by the host system executing them. +Attention: The CVE's below can't be fixed by the container itself, rather need to be addressed by the host system executing them. (Updated script-languages ref) - Ignored CVE-2023-6176 because they are kernel issues and not container issues diff --git a/doc/changes/package_diffs/7.1.0/README.md b/doc/changes/package_diffs/7.1.0/README.md index 5149dd32..82466948 100644 --- a/doc/changes/package_diffs/7.1.0/README.md +++ b/doc/changes/package_diffs/7.1.0/README.md @@ -6,3 +6,4 @@ - [Comparison of flavor Standard-exasol-8.0.0](standard-EXASOL-8.0.0/README.md) - [Comparison of flavor Template-exasol-all-python-3.8-conda](template-Exasol-all-python-3.8-conda/README.md) - [Comparison of flavor Template-exasol-all-python-3.8-cuda-conda](template-Exasol-all-python-3.8-cuda-conda/README.md) +- [Comparison of flavor Template-exasol-all-python-3.10](template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/README.md) diff --git a/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/README.md b/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/README.md new file mode 100644 index 00000000..79cf5627 --- /dev/null +++ b/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/README.md @@ -0,0 +1,17 @@ +# Package Version Comparison between Template-exasol-all-python-3.10 flavor in 7.1.0 and Python-3.8-minimal-exasol-6.2.0 flavor in 7.0.0 + +- Comparison of build step Udfclient_deps + - [Comparison of Apt Get Packages](udfclient_deps/apt_get_packages_diff.md) +- Comparison of build step Security_scan + - [Comparison of Apt Get Packages](security_scan/apt_get_packages_diff.md) + - [Comparison of Apt Get Packages Trivy Deps](security_scan/apt_get_packages_trivy_deps_diff.md) +- Comparison of build step Language_deps + - [Comparison of Apt Get Packages](language_deps/apt_get_packages_diff.md) + - [Comparison of Python3 Pip Packages](language_deps/python3_pip_packages_diff.md) +- Comparison of build step Flavor_base_deps + - [Comparison of Apt Get Packages](flavor_base_deps/apt_get_packages_diff.md) + - [Comparison of Python3 Pip Packages](flavor_base_deps/python3_pip_packages_diff.md) +- Comparison of build step Build_deps + - [Comparison of Apt Get Packages](build_deps/apt_get_packages_diff.md) +- Comparison of build step Base_test_deps + - [Comparison of Apt Get Packages](base_test_deps/apt_get_packages_diff.md) diff --git a/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/base_test_deps/apt_get_packages_diff.md b/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/base_test_deps/apt_get_packages_diff.md new file mode 100644 index 00000000..78c41c4f --- /dev/null +++ b/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/base_test_deps/apt_get_packages_diff.md @@ -0,0 +1,10 @@ + + +| | Package | Version in 7.0.0 | Version in 7.1.0 | Status | +|---:|:----------|:---------------------|:--------------------|:---------| +| 0 | binutils | 2.34-6ubuntu1.6 | 2.38-4ubuntu2.4 | UPDATED | +| 1 | gdb | 9.2-0ubuntu1~20.04.1 | 12.1-0ubuntu1~22.04 | UPDATED | +| 2 | gdbserver | 9.2-0ubuntu1~20.04.1 | 12.1-0ubuntu1~22.04 | UPDATED | +| 3 | patchelf | 0.10-2build1 | 0.14.3-1 | UPDATED | +| 4 | strace | 5.5-3ubuntu1 | 5.16-0ubuntu3 | UPDATED | +| 5 | valgrind | 1:3.15.0-1ubuntu9.1 | 1:3.18.1-1ubuntu2 | UPDATED | \ No newline at end of file diff --git a/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/build_deps/apt_get_packages_diff.md b/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/build_deps/apt_get_packages_diff.md new file mode 100644 index 00000000..6a9d0644 --- /dev/null +++ b/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/build_deps/apt_get_packages_diff.md @@ -0,0 +1,13 @@ + + +| | Package | Version in 7.0.0 | Version in 7.1.0 | Status | +|---:|:------------------|:-------------------------------|:-------------------------------|:---------| +| 0 | curl | 7.68.0-1ubuntu2.20 | 7.68.0-1ubuntu2.19 | UPDATED | +| 1 | locales | 2.31-0ubuntu9.12 | 2.27-3ubuntu1.6 | UPDATED | +| 2 | build-essential | 12.4ubuntu1 | 12.4ubuntu1 | | +| 3 | chrpath | 0.16-2 | 0.16-2 | | +| 4 | coreutils | 8.28-1ubuntu1 | 8.28-1ubuntu1 | | +| 5 | libpcre3-dev | 2:8.39-9ubuntu0.1 | 2:8.39-9ubuntu0.1 | | +| 6 | openjdk-11-jdk | 11.0.19+7~us1-0ubuntu1~20.04.1 | 11.0.19+7~us1-0ubuntu1~20.04.1 | | +| 7 | protobuf-compiler | 3.0.0-9.1ubuntu1.1 | 3.0.0-9.1ubuntu1.1 | | +| 8 | tar | 1.29b-2ubuntu0.4 | 1.29b-2ubuntu0.4 | | \ No newline at end of file diff --git a/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/flavor_base_deps/apt_get_packages_diff.md b/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/flavor_base_deps/apt_get_packages_diff.md new file mode 100644 index 00000000..b5a6bc53 --- /dev/null +++ b/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/flavor_base_deps/apt_get_packages_diff.md @@ -0,0 +1,8 @@ + + +| | Package | Version in 7.0.0 | Version in 7.1.0 | Status | +|---:|:---------------------|:---------------------|:---------------------|:---------| +| 0 | build-essential | 12.8ubuntu1.1 | 12.9ubuntu3 | UPDATED | +| 1 | git | 1:2.25.1-1ubuntu3.11 | 1:2.34.1-1ubuntu1.10 | UPDATED | +| 2 | libcurl4-openssl-dev | 7.68.0-1ubuntu2.20 | 7.81.0-1ubuntu1.15 | UPDATED | +| 3 | unzip | 6.0-25ubuntu1.1 | 6.0-26ubuntu3.1 | UPDATED | \ No newline at end of file diff --git a/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/flavor_base_deps/python3_pip_packages_diff.md b/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/flavor_base_deps/python3_pip_packages_diff.md new file mode 100644 index 00000000..d94b52fc --- /dev/null +++ b/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/flavor_base_deps/python3_pip_packages_diff.md @@ -0,0 +1,4 @@ + + +| Package | Version in 7.0.0 | Version in 7.1.0 | Status | +|-----------|--------------------|--------------------|----------| \ No newline at end of file diff --git a/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/language_deps/apt_get_packages_diff.md b/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/language_deps/apt_get_packages_diff.md new file mode 100644 index 00000000..27d50b81 --- /dev/null +++ b/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/language_deps/apt_get_packages_diff.md @@ -0,0 +1,9 @@ + + +| | Package | Version in 7.0.0 | Version in 7.1.0 | Status | +|---:|:------------------|:------------------------|:------------------------|:---------| +| 0 | ca-certificates | 20230311ubuntu0.20.04.1 | 20230311ubuntu0.22.04.1 | UPDATED | +| 1 | curl | 7.68.0-1ubuntu2.20 | 7.81.0-1ubuntu1.15 | UPDATED | +| 2 | python3-distutils | 3.8.10-0ubuntu1~20.04 | 3.10.8-1~22.04 | UPDATED | +| 3 | python3.8-dev | 3.8.10-0ubuntu1~20.04.8 | | REMOVED | +| 4 | python3.10-dev | | 3.10.12-1~22.04.3 | NEW | \ No newline at end of file diff --git a/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/language_deps/python3_pip_packages_diff.md b/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/language_deps/python3_pip_packages_diff.md new file mode 100644 index 00000000..3806f766 --- /dev/null +++ b/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/language_deps/python3_pip_packages_diff.md @@ -0,0 +1,7 @@ + + +| | Package | Version in 7.0.0 | Version in 7.1.0 | Status | +|---:|:----------|:-------------------|:-------------------|:---------| +| 0 | numpy | 1.24.3 | 1.24.3 | | +| 1 | pandas | 2.0.2 | 2.0.2 | | +| 2 | pyarrow | 14.0.1 | 14.0.1 | | \ No newline at end of file diff --git a/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/security_scan/apt_get_packages_diff.md b/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/security_scan/apt_get_packages_diff.md new file mode 100644 index 00000000..9e35a15c --- /dev/null +++ b/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/security_scan/apt_get_packages_diff.md @@ -0,0 +1,5 @@ + + +| | Package | Version in 7.0.0 | Version in 7.1.0 | Status | +|---:|:----------|:---------------------|:---------------------|:---------| +| 0 | trivy | No version specified | No version specified | | \ No newline at end of file diff --git a/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/security_scan/apt_get_packages_trivy_deps_diff.md b/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/security_scan/apt_get_packages_trivy_deps_diff.md new file mode 100644 index 00000000..f345f828 --- /dev/null +++ b/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/security_scan/apt_get_packages_trivy_deps_diff.md @@ -0,0 +1,6 @@ + + +| | Package | Version in 7.0.0 | Version in 7.1.0 | Status | +|---:|:--------------------|:---------------------|:---------------------|:---------| +| 0 | apt-transport-https | No version specified | No version specified | | +| 1 | gnupg | No version specified | No version specified | | \ No newline at end of file diff --git a/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/udfclient_deps/apt_get_packages_diff.md b/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/udfclient_deps/apt_get_packages_diff.md new file mode 100644 index 00000000..c48432f1 --- /dev/null +++ b/doc/changes/package_diffs/7.1.0/template-Exasol-all-python-3.10__python-3.8-minimal-EXASOL-6.2.0/udfclient_deps/apt_get_packages_diff.md @@ -0,0 +1,10 @@ + + +| | Package | Version in 7.0.0 | Version in 7.1.0 | Status | +|---:|:----------------|:-------------------|:------------------------|:---------| +| 0 | coreutils | 8.30-3ubuntu2 | 8.32-4.1ubuntu1 | UPDATED | +| 1 | libnss-db | 2.2.3pre1-6build6 | 2.2.3pre1-6ubuntu3 | UPDATED | +| 2 | libprotobuf-dev | 3.6.1.3-2ubuntu5.2 | 3.12.4-1ubuntu7.22.04.1 | UPDATED | +| 3 | libssl-dev | 1.1.1f-1ubuntu2.20 | 3.0.2-0ubuntu1.12 | UPDATED | +| 4 | libzmq3-dev | 4.3.2-2ubuntu1 | 4.3.4-2 | UPDATED | +| 5 | locales | 2.31-0ubuntu9.12 | 2.35-0ubuntu3.5 | UPDATED | \ No newline at end of file diff --git a/flavors/README.md b/flavors/README.md index c148de9a..7b8f5767 100644 --- a/flavors/README.md +++ b/flavors/README.md @@ -34,10 +34,20 @@ The Python-3.8-minimal flavor provides the language Python 3.8 with only absolut - python-3.8-minimal-6.2.0 - Base Image: ubuntu:20.04 - - Compatible Exasol Versions: 7.1.\*, 7.0.\*, 6.2.\* + - Compatible Exasol Versions: 8.0.\*, 7.1.\* - Available languages: Python 3.8 - [Here](https://github.com/exasol/script-languages/tree/master/flavors/python-3.8-minimal-EXASOL-6.2.0/FLAVOR_DESCRIPTION.md) you can find more details about the flavor, such as the provided packages. +### template-Exasol-all-python-3.10 + +The template-Exasol-all-python-3.10 flavor provides language Python 3.10 with only absolutely necessary packages. This allows very simple customization because you control almost all dependencies. + +- template-Exasol-all-python-3.10 + - Base Image: ubuntu:22.04 + - Compatible Exasol Versions: 8.0.\*, 7.1.\* + - Available languages: Python 3.10 + - [Here](https://github.com/exasol/script-languages/tree/master/flavors/template-Exasol-all-python-3.10/FLAVOR_DESCRIPTION.md) you can find more details about the flavor, such as the provided packages. + ### template-Exasol-all-python-3.8-conda The template-Exasol-all-python-3.8-conda flavor provides the language Python 3.8 with only absolute necessary packages. This allows very simple customization because you control almost all dependencies. In contrast to Python-3.8-minimal, it also allows the installation of conda packages. @@ -68,9 +78,9 @@ The template-Exasol-all-python-3.8-cuda-conda flavor provides the language Pytho The R-4-minimal flavor provides the language R 4.1 with only absolute necessary packages. This allows very simple customization because you control almost all dependencies. - r-4-minimal-EXASOL-6.2.0 - - Base Image: ubuntu:18.04 - - Compatible Exasol Versions: 7.1.\*, 7.0.\*, 6.2.\* - - Available languages: R 4.1 + - Base Image: ubuntu:22.04 + - Compatible Exasol Versions: 8.0.\*, 7.1.\* + - Available languages: R 4.3 - [Here](r-4-minimal-EXASOL-6.2.0/FLAVOR_DESCRIPTION.md) you can find more details about the flavor, such as the provided packages. ## Flavor or Language-specific features diff --git a/flavors/template-Exasol-all-python-3.10 b/flavors/template-Exasol-all-python-3.10 new file mode 120000 index 00000000..35cf4435 --- /dev/null +++ b/flavors/template-Exasol-all-python-3.10 @@ -0,0 +1 @@ +../script-languages/flavors/template-Exasol-all-python-3.10/ \ No newline at end of file diff --git a/poetry.lock b/poetry.lock index 5f1a2a4e..01fb8a3f 100644 --- a/poetry.lock +++ b/poetry.lock @@ -82,30 +82,34 @@ typecheck = ["mypy"] [[package]] name = "black" -version = "23.11.0" +version = "23.12.0" description = "The uncompromising code formatter." category = "main" optional = false python-versions = ">=3.8" files = [ - {file = "black-23.11.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:dbea0bb8575c6b6303cc65017b46351dc5953eea5c0a59d7b7e3a2d2f433a911"}, - {file = "black-23.11.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:412f56bab20ac85927f3a959230331de5614aecda1ede14b373083f62ec24e6f"}, - {file = "black-23.11.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d136ef5b418c81660ad847efe0e55c58c8208b77a57a28a503a5f345ccf01394"}, - {file = "black-23.11.0-cp310-cp310-win_amd64.whl", hash = "sha256:6c1cac07e64433f646a9a838cdc00c9768b3c362805afc3fce341af0e6a9ae9f"}, - {file = "black-23.11.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:cf57719e581cfd48c4efe28543fea3d139c6b6f1238b3f0102a9c73992cbb479"}, - {file = "black-23.11.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:698c1e0d5c43354ec5d6f4d914d0d553a9ada56c85415700b81dc90125aac244"}, - {file = "black-23.11.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:760415ccc20f9e8747084169110ef75d545f3b0932ee21368f63ac0fee86b221"}, - {file = "black-23.11.0-cp311-cp311-win_amd64.whl", hash = "sha256:58e5f4d08a205b11800332920e285bd25e1a75c54953e05502052738fe16b3b5"}, - {file = "black-23.11.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:45aa1d4675964946e53ab81aeec7a37613c1cb71647b5394779e6efb79d6d187"}, - {file = "black-23.11.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:4c44b7211a3a0570cc097e81135faa5f261264f4dfaa22bd5ee2875a4e773bd6"}, - {file = "black-23.11.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2a9acad1451632021ee0d146c8765782a0c3846e0e0ea46659d7c4f89d9b212b"}, - {file = "black-23.11.0-cp38-cp38-win_amd64.whl", hash = "sha256:fc7f6a44d52747e65a02558e1d807c82df1d66ffa80a601862040a43ec2e3142"}, - {file = "black-23.11.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:7f622b6822f02bfaf2a5cd31fdb7cd86fcf33dab6ced5185c35f5db98260b055"}, - {file = "black-23.11.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:250d7e60f323fcfc8ea6c800d5eba12f7967400eb6c2d21ae85ad31c204fb1f4"}, - {file = "black-23.11.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5133f5507007ba08d8b7b263c7aa0f931af5ba88a29beacc4b2dc23fcefe9c06"}, - {file = "black-23.11.0-cp39-cp39-win_amd64.whl", hash = "sha256:421f3e44aa67138ab1b9bfbc22ee3780b22fa5b291e4db8ab7eee95200726b07"}, - {file = "black-23.11.0-py3-none-any.whl", hash = "sha256:54caaa703227c6e0c87b76326d0862184729a69b73d3b7305b6288e1d830067e"}, - {file = "black-23.11.0.tar.gz", hash = "sha256:4c68855825ff432d197229846f971bc4d6666ce90492e5b02013bcaca4d9ab05"}, + {file = "black-23.12.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:67f19562d367468ab59bd6c36a72b2c84bc2f16b59788690e02bbcb140a77175"}, + {file = "black-23.12.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:bbd75d9f28a7283b7426160ca21c5bd640ca7cd8ef6630b4754b6df9e2da8462"}, + {file = "black-23.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:593596f699ca2dcbbbdfa59fcda7d8ad6604370c10228223cd6cf6ce1ce7ed7e"}, + {file = "black-23.12.0-cp310-cp310-win_amd64.whl", hash = "sha256:12d5f10cce8dc27202e9a252acd1c9a426c83f95496c959406c96b785a92bb7d"}, + {file = "black-23.12.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:e73c5e3d37e5a3513d16b33305713237a234396ae56769b839d7c40759b8a41c"}, + {file = "black-23.12.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ba09cae1657c4f8a8c9ff6cfd4a6baaf915bb4ef7d03acffe6a2f6585fa1bd01"}, + {file = "black-23.12.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ace64c1a349c162d6da3cef91e3b0e78c4fc596ffde9413efa0525456148873d"}, + {file = "black-23.12.0-cp311-cp311-win_amd64.whl", hash = "sha256:72db37a2266b16d256b3ea88b9affcdd5c41a74db551ec3dd4609a59c17d25bf"}, + {file = "black-23.12.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:fdf6f23c83078a6c8da2442f4d4eeb19c28ac2a6416da7671b72f0295c4a697b"}, + {file = "black-23.12.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:39dda060b9b395a6b7bf9c5db28ac87b3c3f48d4fdff470fa8a94ab8271da47e"}, + {file = "black-23.12.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7231670266ca5191a76cb838185d9be59cfa4f5dd401b7c1c70b993c58f6b1b5"}, + {file = "black-23.12.0-cp312-cp312-win_amd64.whl", hash = "sha256:193946e634e80bfb3aec41830f5d7431f8dd5b20d11d89be14b84a97c6b8bc75"}, + {file = "black-23.12.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:bcf91b01ddd91a2fed9a8006d7baa94ccefe7e518556470cf40213bd3d44bbbc"}, + {file = "black-23.12.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:996650a89fe5892714ea4ea87bc45e41a59a1e01675c42c433a35b490e5aa3f0"}, + {file = "black-23.12.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bdbff34c487239a63d86db0c9385b27cdd68b1bfa4e706aa74bb94a435403672"}, + {file = "black-23.12.0-cp38-cp38-win_amd64.whl", hash = "sha256:97af22278043a6a1272daca10a6f4d36c04dfa77e61cbaaf4482e08f3640e9f0"}, + {file = "black-23.12.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:ead25c273adfad1095a8ad32afdb8304933efba56e3c1d31b0fee4143a1e424a"}, + {file = "black-23.12.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c71048345bdbced456cddf1622832276d98a710196b842407840ae8055ade6ee"}, + {file = "black-23.12.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:81a832b6e00eef2c13b3239d514ea3b7d5cc3eaa03d0474eedcbbda59441ba5d"}, + {file = "black-23.12.0-cp39-cp39-win_amd64.whl", hash = "sha256:6a82a711d13e61840fb11a6dfecc7287f2424f1ca34765e70c909a35ffa7fb95"}, + {file = "black-23.12.0-py3-none-any.whl", hash = "sha256:a7c07db8200b5315dc07e331dda4d889a56f6bf4db6a9c2a526fa3166a81614f"}, + {file = "black-23.12.0.tar.gz", hash = "sha256:330a327b422aca0634ecd115985c1c7fd7bdb5b5a2ef8aa9888a82e2ebe9437a"}, ] [package.dependencies] @@ -119,7 +123,7 @@ typing-extensions = {version = ">=4.0.1", markers = "python_version < \"3.11\""} [package.extras] colorama = ["colorama (>=0.4.3)"] -d = ["aiohttp (>=3.7.4)"] +d = ["aiohttp (>=3.7.4)", "aiohttp (>=3.7.4,!=3.9.0)"] jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"] uvloop = ["uvloop (>=0.15.2)"] @@ -163,18 +167,6 @@ urllib3 = ">=1.25.4,<1.27" [package.extras] crt = ["awscrt (==0.16.9)"] -[[package]] -name = "cerberus" -version = "1.3.5" -description = "Lightweight, extensible schema and data validation tool for Pythondictionaries." -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "Cerberus-1.3.5-py3-none-any.whl", hash = "sha256:7649a5815024d18eb7c6aa5e7a95355c649a53aacfc9b050e9d0bf6bfa2af372"}, - {file = "Cerberus-1.3.5.tar.gz", hash = "sha256:81011e10266ef71b6ec6d50e60171258a5b134d69f8fb387d16e4936d0d47642"}, -] - [[package]] name = "certifi" version = "2023.11.17" @@ -500,18 +492,6 @@ wrapt = ">=1.10,<2" [package.extras] dev = ["PyTest", "PyTest-Cov", "bump2version (<1)", "sphinx (<2)", "tox"] -[[package]] -name = "distlib" -version = "0.3.7" -description = "Distribution utilities" -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "distlib-0.3.7-py2.py3-none-any.whl", hash = "sha256:2e24928bc811348f0feb63014e97aaae3037f2cf48712d51ae61df7fd6075057"}, - {file = "distlib-0.3.7.tar.gz", hash = "sha256:9dafe54b34a028eafd95039d5e5d4851a13734540f1331060d31c9916e7147a8"}, -] - [[package]] name = "dnspython" version = "2.4.2" @@ -553,17 +533,6 @@ urllib3 = ">=1.26.0" ssh = ["paramiko (>=2.4.3)"] websockets = ["websocket-client (>=1.3.0)"] -[[package]] -name = "docopt" -version = "0.6.2" -description = "Pythonic argument parser, that will make you smile" -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "docopt-0.6.2.tar.gz", hash = "sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491"}, -] - [[package]] name = "docutils" version = "0.20.1" @@ -904,24 +873,18 @@ files = [ [[package]] name = "isort" -version = "5.13.0" +version = "5.13.2" description = "A Python utility / library to sort Python imports." category = "main" optional = false python-versions = ">=3.8.0" files = [ - {file = "isort-5.13.0-py3-none-any.whl", hash = "sha256:15e0e937819b350bc256a7ae13bb25f4fe4f8871a0bc335b20c3627dba33f458"}, - {file = "isort-5.13.0.tar.gz", hash = "sha256:d67f78c6a1715f224cca46b29d740037bdb6eea15323a133e897cda15876147b"}, + {file = "isort-5.13.2-py3-none-any.whl", hash = "sha256:8ca5e72a8d85860d5a3fa69b8745237f2939afe12dbf656afbcb47fe72d947a6"}, + {file = "isort-5.13.2.tar.gz", hash = "sha256:48fdfcb9face5d58a4f6dde2e72a1fb8dcaf8ab26f95ab49fab84c2ddefb0109"}, ] -[package.dependencies] -pip-api = "*" -pipreqs = "*" -requirementslib = "*" - [package.extras] colors = ["colorama (>=0.4.6)"] -plugins = ["setuptools"] [[package]] name = "jinja2" @@ -1471,64 +1434,6 @@ files = [ {file = "pathspec-0.12.1.tar.gz", hash = "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712"}, ] -[[package]] -name = "pep517" -version = "0.13.1" -description = "Wrappers to build Python packages using PEP 517 hooks" -category = "main" -optional = false -python-versions = ">=3.6" -files = [ - {file = "pep517-0.13.1-py3-none-any.whl", hash = "sha256:31b206f67165b3536dd577c5c3f1518e8fbaf38cbc57efff8369a392feff1721"}, - {file = "pep517-0.13.1.tar.gz", hash = "sha256:1b2fa2ffd3938bb4beffe5d6146cbcb2bda996a5a4da9f31abffd8b24e07b317"}, -] - -[package.dependencies] -tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} - -[[package]] -name = "pip" -version = "23.3.1" -description = "The PyPA recommended tool for installing Python packages." -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "pip-23.3.1-py3-none-any.whl", hash = "sha256:55eb67bb6171d37447e82213be585b75fe2b12b359e993773aca4de9247a052b"}, - {file = "pip-23.3.1.tar.gz", hash = "sha256:1fcaa041308d01f14575f6d0d2ea4b75a3e2871fe4f9c694976f908768e14174"}, -] - -[[package]] -name = "pip-api" -version = "0.0.30" -description = "An unofficial, importable pip API" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "pip-api-0.0.30.tar.gz", hash = "sha256:a05df2c7aa9b7157374bcf4273544201a0c7bae60a9c65bcf84f3959ef3896f3"}, - {file = "pip_api-0.0.30-py3-none-any.whl", hash = "sha256:2a0314bd31522eb9ffe8a99668b0d07fee34ebc537931e7b6483001dbedcbdc9"}, -] - -[package.dependencies] -pip = "*" - -[[package]] -name = "pipreqs" -version = "0.4.13" -description = "Pip requirements.txt generator based on imports in project" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "pipreqs-0.4.13-py2.py3-none-any.whl", hash = "sha256:e522b9ed54aa3e8b7978ff251ab7a9af2f75d2cd8de4c102e881b666a79a308e"}, - {file = "pipreqs-0.4.13.tar.gz", hash = "sha256:a17f167880b6921be37533ce4c81ddc6e22b465c107aad557db43b1add56a99b"}, -] - -[package.dependencies] -docopt = "*" -yarg = "*" - [[package]] name = "pkgutil-resolve-name" version = "1.3.10" @@ -1557,26 +1462,6 @@ files = [ docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.1)", "sphinx-autodoc-typehints (>=1.24)"] test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)"] -[[package]] -name = "plette" -version = "0.4.4" -description = "Structured Pipfile and Pipfile.lock models." -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "plette-0.4.4-py2.py3-none-any.whl", hash = "sha256:42d68ce8c6b966874b68758d87d7f20fcff2eff0d861903eea1062126be4d98f"}, - {file = "plette-0.4.4.tar.gz", hash = "sha256:06b8c09eb90293ad0b8101cb5c95c4ea53e9b2b582901845d0904ff02d237454"}, -] - -[package.dependencies] -cerberus = {version = "*", optional = true, markers = "extra == \"validation\""} -tomlkit = "*" - -[package.extras] -tests = ["pytest", "pytest-cov", "pytest-xdist"] -validation = ["cerberus"] - [[package]] name = "pluggy" version = "1.3.0" @@ -2153,34 +2038,6 @@ urllib3 = ">=1.21.1,<3" socks = ["PySocks (>=1.5.6,!=1.5.7)"] use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] -[[package]] -name = "requirementslib" -version = "3.0.0" -description = "A tool for converting between pip-style and pipfile requirements." -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "requirementslib-3.0.0-py2.py3-none-any.whl", hash = "sha256:67b42903d7c32f89c7047d1020c619d37cb515c475a4ae6f4e5683e1c56d7bf7"}, - {file = "requirementslib-3.0.0.tar.gz", hash = "sha256:28f8e0b1c38b34ae06de68ef115b03bbcdcdb99f9e9393333ff06ded443e3f24"}, -] - -[package.dependencies] -distlib = ">=0.2.8" -pep517 = ">=0.5.0" -pip = ">=23.1" -platformdirs = "*" -plette = {version = "*", extras = ["validation"]} -pydantic = "*" -requests = "*" -setuptools = ">=40.8" -tomlkit = ">=0.5.3" - -[package.extras] -dev = ["nox", "parver", "towncrier", "twine"] -docs = ["sphinx", "sphinx-rtd-theme"] -tests = ["coverage", "hypothesis", "pytest", "pytest-cov", "pytest-timeout", "pytest-xdist", "readme-renderer[md]"] - [[package]] name = "rfc3339-validator" version = "0.1.4" @@ -2632,18 +2489,6 @@ files = [ {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, ] -[[package]] -name = "tomlkit" -version = "0.12.3" -description = "Style preserving TOML library" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "tomlkit-0.12.3-py3-none-any.whl", hash = "sha256:b0a645a9156dc7cb5d3a1f0d4bab66db287fcb8e0430bdd4664a095ea16414ba"}, - {file = "tomlkit-0.12.3.tar.gz", hash = "sha256:75baf5012d06501f07bee5bf8e801b9f343e7aac5a92581f20f80ce632e6b5a4"}, -] - [[package]] name = "tornado" version = "6.4" @@ -2819,21 +2664,6 @@ files = [ {file = "wrapt-1.16.0.tar.gz", hash = "sha256:5f370f952971e7d17c7d1ead40e49f32345a7f7a5373571ef44d800d06b1899d"}, ] -[[package]] -name = "yarg" -version = "0.1.9" -description = "A semi hard Cornish cheese, also queries PyPI (PyPI client)" -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "yarg-0.1.9-py2.py3-none-any.whl", hash = "sha256:4f9cebdc00fac946c9bf2783d634e538a71c7d280a4d806d45fd4dc0ef441492"}, - {file = "yarg-0.1.9.tar.gz", hash = "sha256:55695bf4d1e3e7f756496c36a69ba32c40d18f821e38f61d028f6049e5e15911"}, -] - -[package.dependencies] -requests = "*" - [[package]] name = "zipp" version = "3.17.0" diff --git a/script-languages b/script-languages index aa5e0063..86909102 160000 --- a/script-languages +++ b/script-languages @@ -1 +1 @@ -Subproject commit aa5e0063387bf1ee8577040b7e70063516b0256e +Subproject commit 869091028486599c81e3fa969ee5284227efac3c