Merge pull request #97 from stewartfrancis/update-requirements-meta

Move execution env, update requirements, update dev guide, update build

Author: Tom-Latham

build.sh

@@ -16,7 +16,7 @@ fi
 export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
 
 source "$CMCI_PYTHON_38/bin/activate"
-(set -x; pip install -r requirements.txt)
+(set -x; pip install -r dev-requirements.txt)
 
 (set -x; ANSIBLE_COLLECTIONS_PATHS=../../.. ansible-lint)
 (set -x; python3 -m yamllint -c yamllint.yaml .)
@@ -41,10 +41,10 @@ echo "/*               Integration tests for missing libraries Python 3.8
 echo "/* -------------------------------------------------------------------------- */"
 (set -x; pip uninstall xmltodict -y)
 (set -x; ansible-test integration cics_cmci_missing_xmltodict_library --python 3.8)
-(set -x; pip install -r prod-requirements.txt)
+(set -x; pip install -r requirements.txt)
 (set -x; pip uninstall requests -y)
 (set -x; ansible-test integration cics_cmci_missing_requests_library --python 3.8)
-(set -x; pip install -r prod-requirements.txt)
+(set -x; pip install -r requirements.txt)
 
 echo $?
 deactivate
@@ -54,7 +54,7 @@ echo "/* -----------------------------------------------------------------------
 echo "/*                          Unit tests Python 2.7                             */"
 echo "/* -------------------------------------------------------------------------- */"
 source "$CMCI_PYTHON_27/bin/activate"
-pip install -r requirements.txt
+pip install -r dev-requirements.txt
 (set -x; ansible-test units --python 2.7)
 
 echo "/* -------------------------------------------------------------------------- */"

dev-requirements.txt

@@ -1,6 +1,7 @@
 # (c) Copyright IBM Corp. 2020,2021
 # Apache License, Version 2.0 (see https://opensource.org/licenses/Apache-2.0)
-ansible==2.10.5
+-r requirements.txt
+ansible==2.10.7
 junit-xml==1.9  # To get JUnit xml report from ansible-test
 pytest_mock==1.12.1
 mock==3.0.5

devguide.md

@@ -87,8 +87,8 @@ python3 -m venv venv3
 # Activate venv3
 source venv3/bin/activate
 
-# Install requirements
-pip install -r requirements.txt
+# Install dev-requirements
+pip install -r dev-requirements.txt
 ```
 
 #### Running the unit tests
@@ -141,17 +141,17 @@ python2.7 -m virtualenv venv2
 # Activate venv2
 source venv2/bin/activate
 
-# Install requirements
-pip install -r requirements.txt
+# Install dev-requirements
+pip install -r dev-requirements.txt
 ```
 
-Note that a slightly different set of requirements is installed for python 2.7, as most of the static analysis tools in
-the automated build are run in python 3.8, so are not requirements for the python 2.7 environment.
+Note that a slightly different set of dev requirements is installed for python 2.7, as most of the static analysis tools in
+the automated build are run in python 3.8, so are not dev requirements for the python 2.7 environment.
 
 #### Running the build, tests and static analysis locally
 
 A bash script is provided to automate running the static analysis, and tests in both python 2.7 and python 3.8
-environments.  You will need to have set up `venv`s as described above, with the requirements pre-installed.  You will 
+environments.  You will need to have set up `venv`s as described above, with the dev-requirements pre-installed.  You will 
 then be able to run the build, passing the locations of the python 2.7 and python 3.8 `venv`s as environment variables:
 
 ```bash
@@ -163,7 +163,7 @@ If you are running on Windows, you will need to run the automated build in a doc
 #### Configure PyCharm to be able to run Ansible collection unit tests
 
 First, add the `ansible_pytest_collections` plugin to `PYTHONPATH` for your python interpreter.  This will be in your
-venv if you installed the dependencies using the requirements file:
+venv if you installed the dependencies using the dev requirements file:
 
  - `Preferences > Project: cics-ansible > Python Interpreter > Cog menu > Show all > 
    Select your interpreter > Show paths for the selected interpreter (at the bottom) > Plus > 

execution-environment.yml

@@ -0,0 +1,3 @@
+dependencies:
+  python: requirements.txt
+version: 1

meta/execution-environment.yml

@@ -0,0 +1,7 @@
+name: ibm_zos_cics
+version: "1.0.1"
+managed_requirements:
+  - name: "Python"
+    version: ">=2.7"
+  - name: "CICS TS with CICSplex System Manager"
+    version: ">=4.1"

meta/ibm_zos_cics_meta.yml

@@ -1,4 +1,5 @@
-# (c) Copyright IBM Corp. 2020
+# (c) Copyright IBM Corp. 2020,2021
 # Apache License, Version 2.0 (see https://opensource.org/licenses/Apache-2.0)
--r prod-requirements.txt
--r dev-requirements.txt
+requests==2.23.0
+xmltodict==0.12.0
+typing;python_version<"3.5"