Neptune client

.github/workflows/integration.yml

@@ -81,37 +81,27 @@ jobs:
       - name: Give user /etc/hosts permission
         run: |
           sudo chmod 777 /etc/hosts
-      - name: Run Basic Tests
+      - name: Generate test configuration
         run: |
-          python test/integration/NeptuneIntegrationWorkflowSteps.py \
-            run-tests \
-            --pattern "*without_iam.py" \
+          python test/integration/NeptuneIntegrationWorkflowSteps.py generate-config \
             --cfn-stack-name ${{ needs.generate-stack-name.outputs.stack-name }} \
             --aws-region ${{ secrets.AWS_REGION }}
-      - name: Run Networkx Tests
+      - name: Run Basic Tests
+        env:
+          GRAPH_NOTEBOK_CONFIG: /tmp/graph_notebook_config_integration_test.json
         run: |
-          python test/integration/NeptuneIntegrationWorkflowSteps.py \
-            run-tests \
-            --pattern "*network*.py" \
-            --cfn-stack-name ${{ needs.generate-stack-name.outputs.stack-name }} \
-            --aws-region ${{ secrets.AWS_REGION }}
-      - name: Run Notebook Tests
+          pytest test/integration/without_iam
+      - name: Generate iam test configuration
         run: |
-          python test/integration/NeptuneIntegrationWorkflowSteps.py \
-            run-tests \
-            --pattern "*graph_notebook.py" \
+          python test/integration/NeptuneIntegrationWorkflowSteps.py generate-config \
             --cfn-stack-name ${{ needs.generate-stack-name.outputs.stack-name }} \
-            --aws-region ${{ secrets.AWS_REGION }}
+            --aws-region ${{ secrets.AWS_REGION }} \
+            --iam
       - name: Run IAM Tests
         env:
           GRAPH_NOTEBOK_CONFIG: /tmp/graph_notebook_config_integration_test.json
         run: |
-          python test/integration/NeptuneIntegrationWorkflowSteps.py \
-            run-tests \
-            --pattern "*with_iam.py" \
-            --iam \
-            --cfn-stack-name ${{ needs.generate-stack-name.outputs.stack-name }} \
-            --aws-region ${{ secrets.AWS_REGION }}
+          pytest test/integration/iam
       - name: Cleanup
         run: |
           python test/integration/NeptuneIntegrationWorkflowSteps.py \

.github/workflows/unit.yml

@@ -35,4 +35,4 @@ jobs:
           python -m graph_notebook.notebooks.install
       - name: Test with pytest
         run: |
-          pytest
+          pytest test/unit

ChangeLog.md

@@ -4,14 +4,15 @@ Starting with v1.31.6, this file will contain a record of major features and upd
 
 ## Upcoming
 
-- Add support for Mode, queueRequest, and Dependencies parameters when running %load command
-- Add support for list and dict as map keys in Python Gremlin
+- Add support for Mode, queueRequest, and Dependencies parameters when running %load command ([Link to PR](https://github.com/aws/graph-notebook/pull/91))
+- Add support for list and dict as map keys in Python Gremlin ([Link to PR](https://github.com/aws/graph-notebook/pull/100))
+- Refactor modules that call to Neptune or other SPARQL/Gremlin endpoints to use a unified client object ([Link to PR](https://github.com/aws/graph-notebook/pull/104))
 
 ## Release 2.0.12 (Mar 25, 2021)
 
- - Add default parameters for `get_load_status`
- - Add ipython as a dependency in `setup.py` ([Link to PT](https://github.com/aws/graph-notebook/pull/95))
- - Add parameters in `load_status` for `details`, `errors`, `page`, and `errorsPerPage`
+ - Add default parameters for `get_load_status` ([Link to PR](https://github.com/aws/graph-notebook/pull/96))
+ - Add ipython as a dependency in `setup.py` ([Link to PR](https://github.com/aws/graph-notebook/pull/95))
+ - Add parameters in `load_status` for `details`, `errors`, `page`, and `errorsPerPage` ([Link to PR](https://github.com/aws/graph-notebook/pull/88))
 
 ## Release 2.0.10 (Mar 18, 2021)
 

pytest.ini

@@ -0,0 +1,11 @@
+[pytest]
+markers =
+    neptune: tests which have to run against neptune
+    iam: tests which require iam authentication
+    gremlin: tests which run against a gremlin endpoint
+    sparql: tests which run against SPARQL1.1 endpoint
+    neptuneml: tests which run Neptune ML workloads
+    jupyter: tests which run against ipython/jupyter frameworks
+    reset: test which performs a fast reset against Neptune, running this will wipe your database!
+
+

requirements.txt

@@ -9,8 +9,9 @@ jupyter-contrib-nbextensions
 widgetsnbextension
 gremlinpython
 requests==2.24.0
+ipython==7.16.1
 
 # requirements for testing
 boto3==1.15.15
 botocore==1.18.18
-ipython==7.16.1
+pytest==6.2.2

setup.py

@@ -93,4 +93,7 @@ def get_version():
         'License :: OSI Approved :: Apache Software License'
     ],
     keywords='jupyter neptune gremlin sparql',
+    tests_require=[
+        'pytest'
+    ]
 )