Merge pull request #185 from LLNL/release-0.12.2a

Update version to 0.12.2
LLNL · Aug 5, 2020 · edebea1 · edebea1
2 parents 0da4a49 + afe9592
commit edebea1
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## v0.12.2 - 2020-08-04
 ### Added
 - Added std::string scalar arguments.
 

diff --git a/Makefile b/Makefile
@@ -52,6 +52,7 @@ include $(top)/regression/run/Makefile
 virtualenv : $(venv.dir)
 $(venv.dir) :
 	$(PYTHON) -m venv --system-site-packages $(venv.dir)
+	$(python.dir)/pip install --upgrade pip
 virtualenv2 :
 	$(venv) --system-site-packages $(venv.dir)
 
@@ -111,10 +112,33 @@ pypi:
 
 .PHONY : install-twine sdist testpypi pypi
 
+########################################################################
+# Creating pex executable
+# This puts all of shroud into a single file.
+# https://github.com/pantsbuild/pex
+
+install-pex :
+	$(python.dir)/pip install pex
+
+# Use version in output file name.
+pex-file : vernum = $(shell grep __version__ shroud/metadata.py | awk -F '"' '{print $$2}')
+pex-file : dist-pex/..
+	$(python.dir)/pex . -r requirements.txt --python-shebang="/usr/bin/env python3" \
+          -e shroud.main:main -o dist-pex/shroud-$(vernum).pex
+	cd dist-pex && ln --force --symbolic shroud-$(vernum).pex shroud.pex
+
+# Test pex created executable
+do-test-pex :
+	@export TEST_OUTPUT_DIR=$(top)/$(tempdir)/regression; \
+	export TEST_INPUT_DIR=$(top)/regression; \
+	export EXECUTABLE_DIR=$(top)/dist-pex/shroud.pex; \
+	$(PYTHON) regression/do-test.py $(do-test-args)
+
 ########################################################################
 # Creating shiv executable
 # This puts all of shroud into a single file.
 # https://github.com/linkedin/shiv
+# Note: Python 3.6+
 
 install-shiv :
 	$(python.dir)/pip install shiv
@@ -124,7 +148,7 @@ shiv-file : vernum = $(shell grep __version__ shroud/metadata.py | awk -F '"' '{
 shiv-file : dist-shiv/..
 	$(python.dir)/shiv --python '/usr/bin/env python3' -c shroud \
           -o dist-shiv/shroud-$(vernum).pyz .
-	cd dist-shiv && ln -s shroud-$(vernum).pyz shroud.pyz
+	cd dist-shiv && ln --force --symbolic shroud-$(vernum).pyz shroud.pyz
 
 # Test shiv created executable
 do-test-shiv :

diff --git a/README.md b/README.md
@@ -98,9 +98,10 @@ In addition, a file created by
 is available from the github release.
 Shroud and PyYAML are bundled into a single executable which uses
 the Python3 on your path.
+Shiv requires Python 3.6+.
 
 ```
-wget https://github.com/LLNL/shroud/archive/shroud-0.12.1.pyz
+wget https://github.com/LLNL/shroud/archive/shroud-0.12.2.pyz
 ```
 
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -53,7 +53,7 @@
 # The short X.Y version.
 version = '0.12'
 # The full version, including alpha/beta/rc tags.
-release = '0.12.1'
+release = '0.12.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/regression/reference/none/def_types.yaml b/regression/reference/none/def_types.yaml
@@ -1,5 +1,5 @@
 # def_types.yaml
-# This file is generated by Shroud 0.12.1. Do not edit.
+# This file is generated by Shroud 0.12.2. Do not edit.
 # 
 # Copyright (c) 2017-2020, Lawrence Livermore National Security, LLC and
 # other Shroud Project Developers.

diff --git a/regression/reference/none/none.json b/regression/reference/none/none.json
@@ -1,5 +1,5 @@
 {
-    "__NOTICE__": "This file is generated by Shroud 0.12.1 and is useful for debugging.",
+    "__NOTICE__": "This file is generated by Shroud 0.12.2 and is useful for debugging.",
     "library": {
         "copyright": [
             "Copyright (c) 2017-2020, Lawrence Livermore National Security, LLC and",

diff --git a/regression/reference/none/typeslibrary.h b/regression/reference/none/typeslibrary.h
@@ -1,5 +1,5 @@
 // typeslibrary.h
-// This file is generated by Shroud 0.12.1. Do not edit.
+// This file is generated by Shroud 0.12.2. Do not edit.
 // Copyright (c) 2017-2020, Lawrence Livermore National Security, LLC and
 // other Shroud Project Developers.
 // See the top-level COPYRIGHT file for details.

diff --git a/regression/reference/none/wrapflibrary.f b/regression/reference/none/wrapflibrary.f
@@ -1,5 +1,5 @@
 ! wrapflibrary.f
-! This file is generated by Shroud 0.12.1. Do not edit.
+! This file is generated by Shroud 0.12.2. Do not edit.
 ! Copyright (c) 2017-2020, Lawrence Livermore National Security, LLC and
 ! other Shroud Project Developers.
 ! See the top-level COPYRIGHT file for details.

diff --git a/regression/reference/none/wraplibrary.cpp b/regression/reference/none/wraplibrary.cpp
@@ -1,5 +1,5 @@
 // wraplibrary.cpp
-// This file is generated by Shroud 0.12.1. Do not edit.
+// This file is generated by Shroud 0.12.2. Do not edit.
 // Copyright (c) 2017-2020, Lawrence Livermore National Security, LLC and
 // other Shroud Project Developers.
 // See the top-level COPYRIGHT file for details.

diff --git a/shroud/metadata.py b/shroud/metadata.py
@@ -5,6 +5,6 @@
 # SPDX-License-Identifier: (BSD-3-Clause)
 ########################################################################
 
-__version__ = "0.12.1"
-__version_info__ = (0, 12, 1, "final", 0)
+__version__ = "0.12.2"
+__version_info__ = (0, 12, 2, "final", 0)
 # 'alpha', 'beta', 'candidate', or 'final'.