updated post install

Author: michaelraney

Dockerfile

@@ -14,10 +14,8 @@ RUN mkdir $AWS_KEYSPACES_WORKING_DIR/bin
 #Install jq
 RUN yum install -y jq && yum install python3-pip -y && yum clean all
 
-RUN pip3 install importlib-metadata
-RUN pip3 install boto3
-RUN pip3 install six
-RUN pip3 install -i https://test.pypi.org/simple/ cqlsh-expansion-mjpr==0.9.16
+
+RUN pip3 install cqlsh-expansion==0.9.5
 
 RUN cqlsh-expansion.init
 

cqlsh-expansion/cqlsh_expansion/post_install.py

@@ -43,9 +43,17 @@ def initialize_cassandra_directory():
         else:
             print('Directory already exists ' + config_dir)
 
+        local_repos = site.getusersitepackages()
+        if isinstance(local_repos, str):
+            local_repos = [site.getusersitepackages()]
+
+        global_repos = site.getsitepackages()
+        if isinstance(global_repos, str):
+            global_repos = [site.getusersitepackages()]
+
         cert_found = False
 
-        for one_path in site.getusersitepackages():
+        for one_path in local_repos:
             cert_install_file = os.path.join(one_path, 'cqlsh_expansion', 'sf-class2-root.crt')
             if os.path.exists(cert_install_file):
                 print('Copying cert from ' + cert_install_file + ' to ' + cert_dest_file)
@@ -54,7 +62,7 @@ def initialize_cassandra_directory():
                 break
 
         if not cert_found:
-            for one_path in site.getsitepackages():
+            for one_path in global_repos:
                 cert_install_file = os.path.join(one_path, 'cqlsh_expansion', 'sf-class2-root.crt')
                 if os.path.exists(cert_install_file):
                     print('Copying cert from ' + cert_install_file + ' to ' + cert_dest_file)
@@ -66,7 +74,7 @@ def initialize_cassandra_directory():
             print('sf-class2-root.crt not found ')
 
         cqlshrc_found = False
-        for one_path in site.getusersitepackages():
+        for one_path in local_repos:
             cqlshrc_install_file = os.path.join(one_path, 'cqlsh_expansion', 'cqlshrc_template')
             if os.path.exists(cqlshrc_install_file):
                 print('Copying cqlshrc from ' + cqlshrc_install_file + ' to ' + cqlshrc_dest_file)
@@ -75,7 +83,7 @@ def initialize_cassandra_directory():
                 break
 
         if not cqlshrc_found:
-            for one_path in site.getsitepackages():
+            for one_path in global_repos:
                 cqlshrc_install_file = os.path.join(one_path, 'cqlsh_expansion', 'cqlshrc_template')
                 if os.path.exists(cqlshrc_install_file):
                     print('Copying cqlshrc from '+ cqlshrc_install_file + ' to ' + cqlshrc_dest_file)

cqlsh-expansion/requirements.txt

@@ -1,4 +1,4 @@
-six>1.14.0
+six>=1.12.0
 cassandra-driver
-boto3>=1.16
+boto3
 cassandra-sigv4>=4.0.2

cqlsh-expansion/setup.py

@@ -8,17 +8,17 @@
 
 # Setting up
 setup(
-    name="cqlsh-expansion-mjpr",
-    version='0.9.16',
+    name="cqlsh-expansion",
+    version='0.9.5',
     description='The cqlsh-expansion utility extends native cqlsh functionality to include cloud native capabilities',
     long_description=long_description,
     long_description_content_type='text/markdown',
     url = 'https://github.com/aws-samples/amazon-keyspaces-toolkit/tree/master/cqlsh-expansion',
     python_requires='>=3.6',
     install_requires=[
-        "six>1.14.0",
+        "six>=1.12.0",
         "cassandra-driver",
-        "boto3>=1.16",
+        "boto3",
         "cassandra-sigv4>=4.0.2",
     ],
     classifiers=[