Merge branch 'develop' into dependabot/pip/stix_shifter/pyopenssl-22.1.0

.github/workflows/main.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.8, 3.9]
 
     steps:
     - uses: actions/checkout@v2

OVERVIEW.md

@@ -166,7 +166,7 @@ List updated: October 29, 2021
 
 ### Prerequisites
 
-Python 3.6 is required to use stix-shifter.
+Python 3.8 or greater is required to use stix-shifter.
 
 Stix-shifter provides several functions: `translate` and `transmit` are the primary functions, `execute` offers a way to test the complete stix-shifter flow.
 

README.md

@@ -24,7 +24,7 @@ This stix-shifter has the following dependencies:
 - [antlr4-python3-runtime==4.8](https://pypi.org/project/antlr4-python3-runtime/)
 - [python-dateutil==2.8.1](https://pypi.org/project/python-dateutil/)
 
-Your development environment must use Python version: 3.6, 3.7, 3.8 or 3.9
+Your development environment must use Python version: 3.8 greater
 
 ## Installation
 

adapter-guide/develop-stix-adapter.md

@@ -26,7 +26,7 @@ By implementing a new connector, _Developer A_ allows _Product A_ to fit into th
 
 ## Prerequisites
 
-- Your development environment must use any of the follow Python versions: 3.6, 3.7, 3.8 and 3.9.
+- Your development environment must use Python 3.8 or greater.
 - You must have access to the target data source. In the sample scenario, you must have access to Product A data source.
 - You must be familiar with Product A's query language and APIs.
 - You must be familiar or understand the following concepts:

deployment/ibm_cloud_pak_for_security/Dockerfile

@@ -23,6 +23,10 @@ WORKDIR /opt/app
 LABEL name=${APP} \
 	vendor="IBM" \
 	summary="${APP} connector for CP4S UDI service." \
-	release="1.4.0.0" \
-	version=${VERSION} \
-	description="${APP} connector for CP4S UDI service."
+  # CP4S release
+	release="1.10.0.0" \
+  # Connector version taken from STIX-shifter release
+	version="4.0.8" \
+	description="${APP} connector for CP4S UDI service." \
+	# Comma-delineated list of compatible CP4S releases
+	compatibleReleases="1.10.0.0" 

lab/connector_coding_lab.md

@@ -7,7 +7,7 @@ This is a hands-on lab to start implementing a connector module in STIX-shifter
 
 * Github account
 * Basic knowledge of Git such as forking, committing, branching, pulling, and merging
-* Working knowledge of the Python programming language. This lab will use Python 3.6
+* Working knowledge of the Python programming language. This lab will work with Python 3.8 or greater.
 * An IDE to write Python code, such as VS Code.
 * Knowledge of the data source API that includes API request, response, datatype and schema.
 * Knowledge of STIX 2.0. To learn about STIX Cyber Observable Objects, see the [STIX 2.0](https://docs.oasis-open.org/cti/stix/v2.0/stix-v2.0-part4-cyber-observable-objects.html) specification.

setup.py

@@ -2,11 +2,11 @@
 import subprocess
 import sys
 
-if sys.version_info.major == 3 and sys.version_info.minor > 5:
+if sys.version_info.major == 3 and sys.version_info.minor > 7:
     # good
     print(sys.version)
 else:
-    print("Error: stix-shifter requires python version at least or greater than 3.6")
+    print("Error: stix-shifter requires python 3.8 or greater")
     exit(1)
 
 
@@ -164,8 +164,6 @@ def fill_connectors(projects, modules_path):
         # https://pypi.python.org/pypi?%3Aaction=list_classifiers
         'classifiers': [  # Optional
             'License :: OSI Approved :: Apache Software License',
-            'Programming Language :: Python :: 3.6',
-            'Programming Language :: Python :: 3.7',
             'Programming Language :: Python :: 3.8',
             'Programming Language :: Python :: 3.9',
         ],