From bb3abbced1dd1ee3eb26da2d9326e79315339e32 Mon Sep 17 00:00:00 2001 From: Alessandro De Maria Date: Fri, 19 Jan 2024 12:52:41 +0000 Subject: [PATCH] Revert "Install reclass as pip package" --- .gitmodules | 3 ++ Dockerfile | 3 +- kapitan/reclass | 1 + poetry.lock | 105 ++---------------------------------------------- pyproject.toml | 3 +- 5 files changed, 10 insertions(+), 105 deletions(-) create mode 160000 kapitan/reclass diff --git a/.gitmodules b/.gitmodules index e69de29bb..9d80332aa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "kapitan/reclass"] + path = kapitan/reclass + url = https://github.com/kapicorp/reclass.git diff --git a/Dockerfile b/Dockerfile index a5bb8757b..2835ec0d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,8 +9,7 @@ WORKDIR /kapitan RUN apt-get update \ && apt-get install --no-install-recommends -y \ curl \ - build-essential \ - git + build-essential ENV POETRY_VERSION=1.7.1 ENV VIRTUAL_ENV=/opt/venv diff --git a/kapitan/reclass b/kapitan/reclass new file mode 160000 index 000000000..d220e896a --- /dev/null +++ b/kapitan/reclass @@ -0,0 +1 @@ +Subproject commit d220e896a2465783abf298d71eb927de1f53a0ac diff --git a/poetry.lock b/poetry.lock index 95ea4b15c..eed4c2b34 100644 --- a/poetry.lock +++ b/poetry.lock @@ -151,10 +151,7 @@ files = [ [package.dependencies] jmespath = ">=0.7.1,<2.0.0" python-dateutil = ">=2.1,<3.0.0" -urllib3 = [ - {version = ">=1.25.4,<1.27", markers = "python_version < \"3.10\""}, - {version = ">=1.25.4,<2.1", markers = "python_version >= \"3.10\""}, -] +urllib3 = {version = ">=1.25.4,<2.1", markers = "python_version >= \"3.10\""} [package.extras] crt = ["awscrt (==0.19.19)"] @@ -389,17 +386,6 @@ ssh = ["bcrypt (>=3.1.5)"] test = ["pretend", "pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-xdist"] test-randomorder = ["pytest-randomly"] -[[package]] -name = "ddt" -version = "1.7.1" -description = "Data-Driven/Decorated Tests" -optional = false -python-versions = "*" -files = [ - {file = "ddt-1.7.1-py2.py3-none-any.whl", hash = "sha256:2c4ac421bbdc10d2403b472294500c6f75ca822386c34d9fe82882d7a2ce9682"}, - {file = "ddt-1.7.1.tar.gz", hash = "sha256:1a4472c477bf766f75f7b1efb628656ff3c35ff3f6c821129ae8e328fff8a9a2"}, -] - [[package]] name = "docker" version = "6.1.3" @@ -421,18 +407,6 @@ websocket-client = ">=0.32.0" [package.extras] ssh = ["paramiko (>=2.4.3)"] -[[package]] -name = "enum34" -version = "1.1.10" -description = "Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4" -optional = false -python-versions = "*" -files = [ - {file = "enum34-1.1.10-py2-none-any.whl", hash = "sha256:a98a201d6de3f2ab3db284e70a33b0f896fbf35f8086594e8c9e74b909058d53"}, - {file = "enum34-1.1.10-py3-none-any.whl", hash = "sha256:c3858660960c984d6ab0ebad691265180da2b43f07e061c0f8dca9ef3cffd328"}, - {file = "enum34-1.1.10.tar.gz", hash = "sha256:cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248"}, -] - [[package]] name = "exceptiongroup" version = "1.2.0" @@ -623,25 +597,6 @@ files = [ {file = "idna-3.6.tar.gz", hash = "sha256:9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca"}, ] -[[package]] -name = "importlib-metadata" -version = "7.0.1" -description = "Read metadata from Python packages" -optional = false -python-versions = ">=3.8" -files = [ - {file = "importlib_metadata-7.0.1-py3-none-any.whl", hash = "sha256:4805911c3a4ec7c3966410053e9ec6a1fecd629117df5adee56dfc9432a1081e"}, - {file = "importlib_metadata-7.0.1.tar.gz", hash = "sha256:f238736bb06590ae52ac1fab06a3a9ef1d8dce2b7a35b5ab329371d6c8f5d2cc"}, -] - -[package.dependencies] -zipp = ">=0.5" - -[package.extras] -docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-lint"] -perf = ["ipython"] -testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-perf (>=0.9.2)", "pytest-ruff"] - [[package]] name = "isodate" version = "0.6.1" @@ -1176,28 +1131,6 @@ files = [ {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"}, ] -[[package]] -name = "reclass" -version = "1.6.0" -description = "merge data by recursive descent down an ancestry hierarchy (forked extended version)" -optional = false -python-versions = "*" -files = [] -develop = false - -[package.dependencies] -ddt = "*" -enum34 = "*" -pyparsing = "*" -pyyaml = "*" -six = "*" - -[package.source] -type = "git" -url = "https://github.com/kapicorp/reclass" -reference = "HEAD" -resolved_reference = "856b34cb77811d665c6346883238d436ac5c4924" - [[package]] name = "referencing" version = "0.32.1" @@ -1429,7 +1362,6 @@ files = [ ] [package.dependencies] -importlib-metadata = {version = ">=3.6", markers = "python_version < \"3.10\""} typing-extensions = {version = ">=4.7.0", markers = "python_version < \"3.12\""} [package.extras] @@ -1458,22 +1390,6 @@ files = [ {file = "uritemplate-4.1.1.tar.gz", hash = "sha256:4346edfc5c3b79f694bccd6d6099a322bbeb628dbf2cd86eea55a456ce5124f0"}, ] -[[package]] -name = "urllib3" -version = "1.26.18" -description = "HTTP library with thread-safe connection pooling, file post, and more." -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" -files = [ - {file = "urllib3-1.26.18-py2.py3-none-any.whl", hash = "sha256:34b97092d7e0a3a8cf7cd10e386f401b3737364026c45e622aa02903dffe0f07"}, - {file = "urllib3-1.26.18.tar.gz", hash = "sha256:f8ecc1bba5667413457c529ab955bf8c67b45db799d159066261719e328580a0"}, -] - -[package.extras] -brotli = ["brotli (==1.0.9)", "brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"] -secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"] -socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] - [[package]] name = "urllib3" version = "2.0.7" @@ -1525,26 +1441,11 @@ pyyaml = "*" [package.extras] dev = ["doc8", "flake8", "flake8-import-order", "rstcheck[sphinx]", "sphinx"] -[[package]] -name = "zipp" -version = "3.17.0" -description = "Backport of pathlib-compatible object wrapper for zip files" -optional = false -python-versions = ">=3.8" -files = [ - {file = "zipp-3.17.0-py3-none-any.whl", hash = "sha256:0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31"}, - {file = "zipp-3.17.0.tar.gz", hash = "sha256:84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0"}, -] - -[package.extras] -docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-lint"] -testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy (>=0.9.1)", "pytest-ruff"] - [extras] gojsonnet = ["gojsonnet"] test = ["docker"] [metadata] lock-version = "2.0" -python-versions = "^3.9" -content-hash = "c97108bc1119c1fa03468661ab75d22c982fdaece270369ad9513f05d6339be3" +python-versions = "^3.10" +content-hash = "ac3fdfcfc318acd09a1e0113a1b50fe7059aa20afd0673b24c6a874bf9144ac4" diff --git a/pyproject.toml b/pyproject.toml index af8ec8a7e..877a15a7b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,6 +28,7 @@ license = "Apache-2.0" version = "0.32.0" packages = [ { include = "kapitan" }, + { include = "kapitan/reclass" }, ] [tool.poetry.scripts] @@ -63,7 +64,6 @@ packaging = "^23.0" typing-extensions = "^4.0.0" gojsonnet = { version = "^0.20.0", optional = true } docker = { version = ">=5,<7", optional = true } -reclass = {git = "https://github.com/kapicorp/reclass"} [tool.poetry.extras] gojsonnet = ["gojsonnet"] @@ -75,6 +75,7 @@ target-version = ['py38'] exclude = ''' ( /( + .*reclass.* | .*version.py ) )