Merge pull request #146 from bradmwilliams/ocp-2.0.0

Preparing version 2.0.0

README.md

@@ -89,7 +89,7 @@ Can you run `oc project` successfully from the command line? Then write your app
 
 ```python
 #!/usr/bin/python
-import openshift as oc
+import openshift_client as oc
 
 print('OpenShift client version: {}'.format(oc.get_client_version()))
 print('OpenShift server version: {}'.format(oc.get_server_version()))
@@ -304,7 +304,7 @@ process -- it will consume memory for every oc invocation.*
 
 ```python
 #!/usr/bin/python
-import openshift as oc
+import openshift_client as oc
 
 with oc.tracking() as tracker:
     try:
@@ -382,7 +382,7 @@ the current oc invocation will be killed.
 
 ```python
 #!/usr/bin/python
-import openshift as oc
+import openshift_client as oc
 
 def node_is_ready(node):
     ready = node.model.status.conditions.can_match({
@@ -448,7 +448,7 @@ context. Before running this command, you will need to load your ssh agent up wi
 appropriate to the target client host.
 
 ```python
-with openshift.client_host(hostname="my.cluster.com", username="root", auto_add_host=True):
+with openshift_client.client_host(hostname="my.cluster.com", username="root", auto_add_host=True):
     # oc invocations will take place on my.cluster.com host as the root user.
     print("Current project: " + oc.get_project_name())
 ```

ansible/rebuild_module.digest

@@ -1 +1 @@
-d2800ec0e827b83a8423e15704e7699f  -
+e636ef96934d7b577b5cb42f65904f20  -

ansible/rebuild_module.sh

@@ -19,8 +19,8 @@ fi
 
 pushd "$PACKAGES_DIR"
 # Update module digest so that pr.groovy can ensure it is run after each module change
-cat $(find openshift/ -name '*.py' | sort -d) | md5sum > $DIR/rebuild_module.digest
-ENCODED_TGZ=$(tar c --owner=0 --numeric-owner --group=0 --mtime='UTC 2019-01-01' $(find openshift/ -name '*.py' | sort -d) | gzip -c -n | base64 --wrap=0)
+cat $(find openshift_client/ -name '*.py' | sort -d) | md5sum > $DIR/rebuild_module.digest
+ENCODED_TGZ=$(tar c --owner=0 --numeric-owner --group=0 --mtime='UTC 2019-01-01' $(find openshift_client/ -name '*.py' | sort -d) | gzip -c -n | base64 --wrap=0)
 popd
 
 echo "#!/usr/bin/env python" > $OUTPUT_FILE

ansible/roles/openshift_client_python/library/openshift_client_python.template.py

@@ -17,12 +17,12 @@
 
 # Allows modules to trigger errors
 def error(msg, **kwargs):
-    import openshift as oc
+    import openshift_client as oc
     raise oc.OpenShiftPythonException(msg, **kwargs)
 
 
 def main():
-    import openshift as oc
+    import openshift_client as oc
     script = module.params["script"]
     time = module.params["timeout"]
     oc.ansible.reset()
@@ -91,9 +91,9 @@ def main():
         tf.extractall(client_python_extract_dir)
         # Add the newly extacted directory to the python path to resolve the openshift package
         sys.path.append(client_python_extract_dir)
-        # Import openshift as oc so that we can delete the extract directory. module.exit_ type methods
+        # Import openshift_client as oc so that we can delete the extract directory. module.exit_ type methods
         # call sys.exit, so this is our only chance to leave no trace.
-        import openshift as oc
+        import openshift_client as oc
         shutil.rmtree(client_python_extract_dir)
         main()
     finally:

examples/cluster_tests.py

@@ -7,7 +7,7 @@
 import logging
 import traceback
 
-import openshift as oc
+import openshift_client as oc
 from contextlib import contextmanager
 
 

examples/coverage.py

@@ -3,8 +3,8 @@
 from __future__ import print_function
 from __future__ import absolute_import
 
-import openshift as oc
-from openshift import null, Missing, OpenShiftPythonException
+import openshift_client as oc
+from openshift_client import null, Missing, OpenShiftPythonException
 
 try:
 

examples/custom_apiobjects.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-import openshift as oc
-from openshift import APIObject
+import openshift_client as oc
+from openshift_client import APIObject
 
 
 class MyCustomPodClass(APIObject):

examples/dump.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 from __future__ import absolute_import
-import openshift as oc
+import openshift_client as oc
 
 if __name__ == '__main__':
     with oc.client_host():

examples/ephemeral_project.py

@@ -5,9 +5,9 @@
 import argparse
 import logging
 import traceback
-import openshift as oc
-from openshift import OpenShiftPythonException
-from openshift.decorators import ephemeral_project
+import openshift_client as oc
+from openshift_client import OpenShiftPythonException
+from openshift_client.decorators import ephemeral_project
 
 logging.basicConfig(format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
 logger = logging.getLogger('EphemeralProject')

examples/exception_tracking.py

@@ -5,8 +5,8 @@
 import argparse
 import logging
 import traceback
-import openshift as oc
-from openshift import OpenShiftPythonException
+import openshift_client as oc
+from openshift_client import OpenShiftPythonException
 
 logging.basicConfig(format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
 logger = logging.getLogger('ExceptionTracking')

examples/oc_action.py

@@ -3,8 +3,8 @@
 from __future__ import print_function
 from __future__ import absolute_import
 
-from openshift import Result
-import openshift as oc
+from openshift_client import Result
+import openshift_client as oc
 
 '''
 This example illustrates how you can utilize the "oc_action" method to perform any "oc" operations that are not

examples/report.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 from __future__ import absolute_import
-import openshift as oc
+import openshift_client as oc
 
 if __name__ == '__main__':
     with oc.client_host():

examples/simple.py

@@ -2,7 +2,7 @@
 
 from __future__ import print_function
 from __future__ import absolute_import
-import openshift as oc
+import openshift_client as oc
 
 if __name__ == '__main__':
     with oc.tracking() as tracker:

examples/templates.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import openshift as oc
+import openshift_client as oc
 
 '''
 This example will scan all the templates, on the cluster, and look specifically for the openshift/nginx-example

packages/monitoring.py

@@ -2,8 +2,8 @@
 
 from __future__ import print_function
 from __future__ import absolute_import
-import openshift as oc
-from openshift import Missing
+import openshift_client as oc
+from openshift_client import Missing
 import traceback
 
 with oc.tracking() as t:

packages/openshift/__init__.py → packages/openshift_client/__init__.py

@@ -12,7 +12,7 @@
 from .ansible import ansible
 
 # Single source for module version
-__VERSION__ = '1.0.20'
+__VERSION__ = '2.0.0'
 
 null = None  # Allow scripts to specify null in object definitions
 

packages/openshift/config.py → packages/openshift_client/config.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 
-import openshift as oc
+import openshift_client as oc
 import base64
 import json
 

packages/openshift/test_apiobject.py → packages/openshift_client/test_apiobject.py

@@ -1,6 +1,6 @@
 import unittest
 
-from openshift import Context
+from openshift_client import Context
 from .apiobject import APIObject
 
 

run_unittests.sh

@@ -4,5 +4,14 @@ SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]:-$0}")
 
 export PYTHONPATH="${SCRIPT_ROOT}/packages"
 cd ${SCRIPT_ROOT}/packages
-python2 -m unittest discover
+
+if command -v python2 > /dev/null
+then
+  echo "python2: running unit tests"
+  python2 -m unittest discover
+else
+  echo "python2 not detected. Skipping"
+fi
+
+echo "python3: running unit tests"
 python3 -m unittest discover

setup.py

@@ -24,7 +24,7 @@ def read(rel_path):
 
 
 def get_version(rel_path):
-    """Returns the semantic version for the openshift-client module."""
+    """Returns the semantic version for the openshift_client module."""
     for line in read(rel_path).splitlines():
         if line.startswith('__VERSION__'):
             delim = '"' if '"' in line else "'"
@@ -35,7 +35,7 @@ def get_version(rel_path):
 
 setup(
     name="openshift-client",
-    version=get_version('packages/openshift/__init__.py'),
+    version=get_version('packages/openshift_client/__init__.py'),
     author="Justin Pierce",
     author_email="jupierce@redhat.com",
     maintainer="Brad Williams",
@@ -63,6 +63,6 @@ def get_version(rel_path):
         "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.12",
     ],
 )