Release v1.2.1 (#188)

* Update and support or python 2  (#187)

* fix python2 incompatibility

* add python2 support, fix lint issue

* remove Path library dependency for python2 support

* remove fullmatch dependency from zos_copy

* update encode utility for python2, fix bug caused by earlier python2 update

* adding asif's updates

* Update docs and meta data to next version increment

* Remove space, avoid pep8 rules

Co-authored-by: Blake Becker <[email protected]>

Author: ddimatos

docs/source/conf.py

@@ -147,7 +147,7 @@
 # White list which Git tags documentation will be generated and linked into the
 # version selection box. This is currently a manual selection, until more
 # versions are released, there are no regular expressions used.
-scv_whitelist_tags = ('v1.0.0', 'v1.1.0$', 'v1.2.0$',)
+scv_whitelist_tags = ('v1.0.0', 'v1.1.0$', 'v1.2.1$',)
 
 # Sort versions by one or more values. Valid values are semver, alpha, and time.
 # Semantic is referred to as 'semver', this would ensure our latest VRM is

docs/source/release_notes.rst

@@ -6,6 +6,70 @@
 Releases
 ========
 
+Version 1.2.1
+=============
+
+Notes
+-----
+
+* Update required
+* Module changes
+
+  * Noteworthy Python 2.x support
+
+    * encode - removed TemporaryDirectory usage.
+    * zos_copy - fixed regex support, dictionary merge operation fix
+    * zos_fetch - fix quote import
+
+* Collection changes
+
+  * Beginning this release, all sample playbooks previously included with the
+    collection will be made available on the `samples repository`_. The
+    `samples repository`_ explains the playbook concepts,
+    discusses z/OS administration, provides links to the samples support site,
+    blogs and other community resources.
+
+* Documentation changes
+
+  * In this release, documentation related to playbook configuration has been
+    migrated to the `samples repository`_. Each sample contains a README that
+    explains what configurations must be made to run the sample playbook.
+
+.. _samples repository:
+   https://github.com/IBM/z_ansible_collections_samples/blob/master/README.md
+
+Availability
+------------
+
+* `Automation Hub`_
+* `Galaxy`_
+* `GitHub`_
+
+Reference
+---------
+
+* Supported by IBM Open Enterprise Python for z/OS: 3.8.2 or later
+* Supported by IBM Z Open Automation Utilities 1.0.3 PTF UI70435
+* Supported by z/OS V2R3
+* The z/OS® shell
+
+Known issues
+------------
+
+* Modules
+
+  * When executing programs using ``zos_mvs_raw``, you may encounter errors
+    that originate in the programs implementation. Two such known issues are
+    noted below of which one has been addressed with an APAR.
+
+    #. ``zos_mvs_raw`` module execution fails when invoking
+       Database Image Copy 2 Utility or Database Recovery Utility in conjunction
+       with FlashCopy or Fast Replication.
+    #. ``zos_mvs_raw`` module execution fails when invoking DFSRRC00 with parm
+       "UPB,PRECOMP", "UPB, POSTCOMP" or "UPB,PRECOMP,POSTCOMP". This issue is
+       addressed by APAR PH28089.
+
+
 Version 1.2.0
 =============
 
@@ -33,7 +97,6 @@ Notes
 Availability
 ------------
 
-* `Automation Hub`_
 * `Galaxy`_
 * `GitHub`_
 

galaxy.yml

@@ -6,7 +6,7 @@ namespace: ibm
 name: ibm_zos_core
 
 # The collection version
-version: 1.2.0
+version: 1.2.1
 
 # Collection README file
 readme: README.md

plugins/module_utils/encode.py

@@ -6,7 +6,7 @@
 
 __metaclass__ = type
 
-from tempfile import NamedTemporaryFile, TemporaryDirectory, mkstemp
+from tempfile import NamedTemporaryFile, mkstemp, mkdtemp
 from math import floor, ceil
 from os import path, walk, makedirs, unlink
 from ansible.module_utils.six import PY3
@@ -23,9 +23,7 @@
 from ansible_collections.ibm.ibm_zos_core.plugins.module_utils.better_arg_parser import (
     BetterArgParser,
 )
-from ansible_collections.ibm.ibm_zos_core.plugins.module_utils import (
-    copy, system
-)
+from ansible_collections.ibm.ibm_zos_core.plugins.module_utils import copy, system
 from ansible_collections.ibm.ibm_zos_core.plugins.module_utils.ansible_module import (
     AnsibleModuleHelper,
 )
@@ -81,25 +79,33 @@ def __init__(self):
         self.module = AnsibleModuleHelper(argument_spec={})
 
     def _validate_data_set_name(self, ds):
-        arg_defs = dict(ds=dict(arg_type="data_set"),)
+        arg_defs = dict(
+            ds=dict(arg_type="data_set"),
+        )
         parser = BetterArgParser(arg_defs)
         parsed_args = parser.parse_args({"ds": ds})
         return parsed_args.get("ds")
 
     def _validate_path(self, path):
-        arg_defs = dict(path=dict(arg_type="path"),)
+        arg_defs = dict(
+            path=dict(arg_type="path"),
+        )
         parser = BetterArgParser(arg_defs)
         parsed_args = parser.parse_args({"path": path})
         return parsed_args.get("path")
 
     def _validate_data_set_or_path(self, path):
-        arg_defs = dict(path=dict(arg_type="data_set_or_path"),)
+        arg_defs = dict(
+            path=dict(arg_type="data_set_or_path"),
+        )
         parser = BetterArgParser(arg_defs)
         parsed_args = parser.parse_args({"path": path})
         return parsed_args.get("path")
 
     def _validate_encoding(self, encoding):
-        arg_defs = dict(encoding=dict(arg_type="encoding"),)
+        arg_defs = dict(
+            encoding=dict(arg_type="encoding"),
+        )
         parser = BetterArgParser(arg_defs)
         parsed_args = parser.parse_args({"encoding": encoding})
         return parsed_args.get("encoding")
@@ -281,7 +287,7 @@ def uss_convert_encoding(self, src, dest, from_code, to_code):
         return convert_rc
 
     def uss_convert_encoding_prev(self, src, dest, from_code, to_code):
-        """ For multiple files conversion, such as a USS path or MVS PDS data set,
+        """For multiple files conversion, such as a USS path or MVS PDS data set,
         use this method to split then do the conversion
 
         Arguments:
@@ -378,8 +384,7 @@ def mvs_convert_encoding(
                 temp_src = temp_src_fo.name
                 rc, out, err = copy.copy_ps2uss(src, temp_src)
             if src_type == "PO":
-                temp_src_fo = TemporaryDirectory()
-                temp_src = temp_src_fo.name
+                temp_src = mkdtemp()
                 rc, out, err = copy.copy_pds2uss(src, temp_src)
             if src_type == "VSAM":
                 reclen, space_u = self.listdsi_data_set(src.upper())
@@ -392,8 +397,7 @@ def mvs_convert_encoding(
                 temp_dest_fo = NamedTemporaryFile()
                 temp_dest = temp_dest_fo.name
             if dest_type == "PO":
-                temp_dest_fo = TemporaryDirectory()
-                temp_dest = temp_dest_fo.name
+                temp_dest = mkdtemp()
             rc = self.uss_convert_encoding_prev(temp_src, temp_dest, from_code, to_code)
             if rc:
                 if not dest_type:
@@ -419,6 +423,13 @@ def mvs_convert_encoding(
         finally:
             if temp_ps:
                 Datasets.delete(temp_ps)
+            if temp_src and temp_src != src:
+                if os.path.isdir(temp_src):
+                    shutil.rmtree(temp_src)
+            if temp_dest and temp_dest != dest:
+                if os.path.isdir(temp_dest):
+                    shutil.rmtree(temp_dest)
+
         return convert_rc
 
 

plugins/module_utils/system.py

@@ -93,7 +93,7 @@ def run_command(args, stdin=None, **kwargs):
         err = "'args' must be list or string"
         return rc, out, err
 
-    if isinstance(args, text_type):
+    if isinstance(args, (text_type, str)):
         if PY2:
             args = to_bytes(args, errors='surrogate_or_strict')
         elif PY3: