Merge pull request #25 from runprism/dev

v0.2.0

prism/constants.py

@@ -17,7 +17,7 @@
 #############
 
 # Version number
-VERSION = '0.2.0rc2'
+VERSION = '0.2.0'
 
 # Root directory of project
 ROOT_DIR = str(Path(os.path.dirname(__file__)).parent)

prism/mixins/aws.py

@@ -75,8 +75,19 @@ def create_key_pair(self,
         )
         if not Path(directory).is_dir():
             Path(directory).mkdir(parents=True)
-        with open(Path(directory / f"{key_name}.pem"), 'w') as f:
-            f.write(response["KeyMaterial"])
+
+        # Write the key to a local file
+        try:
+            with open(Path(directory / f"{key_name}.pem"), 'w') as f:
+                f.write(response["KeyMaterial"])
+
+        # If the path already exists and cannot be edited, then raise the exception. But
+        # first, delete the newly created key pair.
+        except Exception as e:
+            ec2_client.delete_key_pair(
+                KeyName=key_name
+            )
+            raise e
 
         # Change the permissions
         os.chmod(Path(directory / f"{key_name}.pem"), stat.S_IREAD)

prism/tests/integration/test_projects/021_project_with_local_tasks/tasks/extract.py

@@ -33,4 +33,5 @@ def extract(tasks, hooks):
     api_url = "https://restcountries.com/v3.1/all"
     resp = requests.get(api_url, verify=False)
     data = json.loads(resp.text)
+    data = sorted(data, key=lambda x: x["name"]["common"])
     return data

prism/tests/integration/test_projects/021_project_with_local_tasks/tasks/transform_load.py

@@ -34,7 +34,7 @@ def transform(tasks, hooks):
                 independent_countries.append(c)
         except KeyError:
             continue
-    return independent_countries
+    return sorted(independent_countries, key=lambda x: x["name"]["common"])
 
 
 @task(

prism/tests/integration/test_run.py

@@ -1339,8 +1339,8 @@ def test_project_local_tasks(self):
             all_countries = json.loads(f.read())
         with open(Path(wkdir / 'output' / 'independent_countries.json'), 'r') as f:
             independent_countries = json.loads(f.read())
-        self.assertEqual(all_countries[-1]["name"]["common"], "Guinea-Bissau")
-        self.assertEqual(independent_countries[0]["name"]["common"], "Jordan")
+        self.assertEqual(all_countries[-1]["name"]["common"], "Åland Islands")
+        self.assertEqual(independent_countries[0]["name"]["common"], "Afghanistan")
 
         # Remove the .compiled directory, if it exists
         self._remove_compiled_dir(wkdir)
@@ -1398,7 +1398,7 @@ def test_project_local_tasks_specific_module(self):
         )
         with open(Path(wkdir / 'output' / 'all_countries.json'), 'r') as f:
             all_countries = json.loads(f.read())
-        self.assertEqual(all_countries[-1]["name"]["common"], "Guinea-Bissau")
+        self.assertEqual(all_countries[-1]["name"]["common"], "Åland Islands")
 
         # ------------------------------------------
         # Now, execute transform_load
@@ -1427,7 +1427,7 @@ def test_project_local_tasks_specific_module(self):
         self.assertTrue(Path(wkdir / 'output' / 'independent_countries.json').is_file())
         with open(Path(wkdir / 'output' / 'independent_countries.json'), 'r') as f:
             independent_countries = json.loads(f.read())
-        self.assertEqual(independent_countries[0]["name"]["common"], "Jordan")
+        self.assertEqual(independent_countries[0]["name"]["common"], "Afghanistan")
 
         # Remove the .compiled directory, if it exists
         self._remove_compiled_dir(wkdir)

setup.cfg

@@ -3,7 +3,7 @@ name = prism-ds
 description = The easiest way to create data pipelines in Python.
 long_description_content_type = text/markdown
 long_description = file: README.md
-version = 0.2.0rc2
+version = 0.2.0
 author = prism founders
 author_email = hello@runprism.com
 license = Apache-2.0