Merge pull request #504 from deepmind/release-v0.27.3-rc.1

Update pip dependencies and reclass to latest versions
kapicorp · May 7, 2020 · 6573762 · 6573762
2 parents 2613f2b + 8bf8b28
commit 6573762
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 15 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "kapitan/reclass"]
-  path = kapitan/reclass
-  url = https://github.com/salt-formulas/reclass.git
+	path = kapitan/reclass
+	url = https://github.com/kapicorp/reclass.git
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 0.27.3-rc.1:
+- Update pip dependencies to latest versions (#504)
+
 ## 0.27.3-rc.0:
 - Compile refs in embedded format (#502)
 

diff --git a/Dockerfile b/Dockerfile
@@ -24,7 +24,7 @@ RUN apt-get update \
     && apt-get install --no-install-recommends -y \
         build-essential \
     && python -m venv /opt/venv \
-    && pip install --upgrade pip yq \
+    && pip install --upgrade pip yq wheel \
     && pip install -r requirements.txt \
     && ./kapitan/inputs/helm/build.sh \
     && pip install .

diff --git a/Dockerfile.ci b/Dockerfile.ci
@@ -68,7 +68,7 @@ RUN apt-get update \
     # Metrics namespace for server side analytics
     && gcloud config set metrics/environment github_docker_image \
     && python -m venv /opt/venv \
-    && pip install --upgrade pip yq \
+    && pip install --upgrade pip yq wheel \
     && pip install -r ./kapitan/requirements.txt \
     && ./kapitan/kapitan/inputs/helm/build.sh \
     && pip install ./kapitan \

diff --git a/Dockerfile.pyinstaller b/Dockerfile.pyinstaller
@@ -28,7 +28,7 @@ RUN apt-get update \
     && apt-get install --no-install-recommends -y \
         build-essential \
     && python -m venv /opt/venv \
-    && pip install --upgrade pip \
+    && pip install --upgrade pip wheel \
     && pip install pyinstaller==$PYINSTALLER_VERSION \
     && pip install -r requirements.txt \
     && ./kapitan/inputs/helm/build.sh \

diff --git a/kapitan/reclass b/kapitan/reclass
diff --git a/requirements.txt b/requirements.txt
@@ -1,20 +1,20 @@
 # kapitan dependencies
 jsonnet==0.15.0
-pyyaml>=5.3
-Jinja2>=2.11.1
+pyyaml>=5.3.1
+Jinja2>=2.11.2
 jsonschema==3.2.0
-python-gnupg==0.4.5
+python-gnupg==0.4.6
 six>=1.14.0
-cryptography>=2.8
+cryptography>=2.9.2
 google-api-python-client==1.7.11
-boto3>=1.12.1
-requests==2.22.0
+boto3>=1.13.4
+requests==2.23.0
 addict==2.2.1
-yamllint>=1.20.0
+yamllint>=1.23.0
 cffi
 rfc3987==1.3.8
-GitPython==3.0.8
-hvac==0.9.6
+GitPython==3.1.2
+hvac==0.10.1
 docker==4.2.0
 # Reclass dependencies
 pyparsing
+153 −0		README-extensions.rst
+5 −4		README.rst
+4 −0		doc/source/changelog.rst
+1 −1		reclass/__init__.py
+21 −10		reclass/core.py
+4 −8		reclass/datatypes/applications.py
+1 −1		reclass/datatypes/classes.py
+10 −11		reclass/datatypes/entity.py
+0 −3		reclass/datatypes/exports.py
+9 −10		reclass/datatypes/parameters.py
+9 −0		reclass/datatypes/tests/test_exports.py
+7 −7		reclass/datatypes/tests/test_parameters.py
+1 −1		reclass/errors.py
+46 −54		reclass/settings.py
+12 −0		reclass/storage/__init__.py
+2 −1		reclass/storage/loader.py
+7 −7		reclass/storage/mixed/__init__.py
+16 −20		reclass/storage/yaml_fs/__init__.py
+1 −1		reclass/storage/yaml_fs/directory.py
+54 −19		reclass/storage/yaml_git/__init__.py
+28 −0		reclass/storage/yamldata.py
+2 −0		reclass/tests/data/02/classes/four.yml
+2 −0		reclass/tests/data/02/classes/init.yml
+13 −0		reclass/tests/data/02/classes/one/alpha.yml
+2 −0		reclass/tests/data/02/classes/one/beta.yml
+2 −0		reclass/tests/data/02/classes/three.yml
+2 −0		reclass/tests/data/02/classes/two/beta.yml
+2 −0		reclass/tests/data/02/classes/two/gamma.yml
+2 −0		reclass/tests/data/02/nodes/relative.yml
+2 −0		reclass/tests/data/02/nodes/top_relative.yml
+6 −0		reclass/tests/data/03/classes/a.yml
+6 −0		reclass/tests/data/03/classes/b.yml
+6 −0		reclass/tests/data/03/classes/c.yml
+6 −0		reclass/tests/data/03/classes/d.yml
+3 −0		reclass/tests/data/03/nodes/alpha/one.yml
+3 −0		reclass/tests/data/03/nodes/alpha/two.yml
+3 −0		reclass/tests/data/03/nodes/beta/one.yml
+3 −0		reclass/tests/data/03/nodes/beta/two.yml
+27 −0		reclass/tests/test_core.py
+7 −6		reclass/values/invitem.py
+6 −4		reclass/values/item.py
+48 −27		reclass/values/parser.py
+49 −32		reclass/values/parser_funcs.py
+9 −8		reclass/values/refitem.py
+8 −14		reclass/values/tests/test_compitem.py
+48 −0		reclass/values/tests/test_item.py
+31 −0		reclass/values/tests/test_listitem.py
+116 −0		reclass/values/tests/test_parser_functions.py
+57 −0		reclass/values/tests/test_refitem.py
+38 −0		reclass/values/tests/test_scaitem.py
+5 −18		reclass/values/value.py
+16 −17		reclass/values/valuelist.py
+5 −3		reclass/version.py
+1 −0		requirements.txt
+1 −1		setup.py
+4 −0		test/model/extensions/classes/defaults.yml
+3 −0		test/model/extensions/classes/relative/init.yml
+5 −0		test/model/extensions/classes/relative/nested/common.yml
+5 −0		test/model/extensions/classes/relative/nested/deep/common.yml
+9 −0		test/model/extensions/classes/relative/nested/deep/init.yml
+5 −0		test/model/extensions/classes/relative/nested/dive/session.yml
+10 −0		test/model/extensions/classes/relative/nested/init.yml
+1 −0		test/model/extensions/classes/second.yml
+1 −0		test/model/extensions/classes/third.yml
+1 −1		test/model/extensions/nodes/reclass.yml