Merge pull request #817 from lorengordon/fix/python-selections

plus3it · Sep 6, 2023 · 9429503 · 9429503
2 parents 7181118 + 09ca704
commit 9429503
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.24.11
+current_version = 0.24.12
 commit = True
 message = Bumps version to {new_version}
 tag = False

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,13 +4,31 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
-### [0.24.11](https://github.com/plus3it/tardigrade-ci/releases/tag/0.24.10)
+### [0.24.12](https://github.com/plus3it/tardigrade-ci/releases/tag/0.24.12)
+
+**Released**: 2023.09.06
+
+**Summary**:
+
+* Selects/enables global and python38 versions in docker image
+* Adds `pr` target that is an alias for the `pullrequest` target
+
+* Updates tool version:
+    * cfn-lint 0.79.8
+    * editorconfig 2.7.1
+    * pytest 7.4.1
+    * python 3.8.18
+    * terragrunt 0.50.12
+    * terraform 1.5.6
+
+### [0.24.11](https://github.com/plus3it/tardigrade-ci/releases/tag/0.24.11)
 
 **Released**: 2023.08.22
 
 **Summary**:
 
 * Removes deprecated custom endpoints used in tests
+
 * Updates tool version:
     * cfn-lint 0.79.7
     * fixuid v0.6.0
@@ -24,6 +42,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 **Summary**:
 
 * Add new makefile target 'pullrequest' to run formatters, lint and documentation in one call
+
 * Updates tool version:
     * cfn-lint 0.79.6
     * pylint 2.17.5

diff --git a/Dockerfile b/Dockerfile
@@ -61,7 +61,11 @@ ENV GOPATH=/go
 RUN make -C /${PROJECT_NAME} install
 
 # Install python versions
-RUN make -C /${PROJECT_NAME} python38/install
+RUN make -C /${PROJECT_NAME} python38/install \
+    && pyenv global system $(pyenv versions | grep 3.8)
+RUN python --version \
+    && python3 --version \
+    && python3.8 --version
 
 WORKDIR /${PROJECT_NAME}
 ENTRYPOINT ["entrypoint.sh"]
diff --git a/Makefile b/Makefile
@@ -584,3 +584,4 @@ install: rclone/install packer/install pyenv/install
 lint: project/validate terraform/lint sh/lint json/lint docs/lint python/lint ec/lint cfn/lint hcl/lint yaml/lint
 
 pullrequest: python/format hcl/format terraform/format json/format docs/generate lint
+pr: pullrequest
Original file line number	Diff line number	Diff line change
Expand Up		@@ -584,3 +584,4 @@ install: rclone/install packer/install pyenv/install
		lint: project/validate terraform/lint sh/lint json/lint docs/lint python/lint ec/lint cfn/lint hcl/lint yaml/lint

		pullrequest: python/format hcl/format terraform/format json/format docs/generate lint
		pr: pullrequest