fixed conflicts

Author: sean-morris

nbgitpuller/handlers.py

@@ -46,6 +46,7 @@ def setup_plugins(self, provider):
         pm.load_setuptools_entrypoints("nbgitpuller", name=provider)
         return pm
 
+<<<<<<< HEAD
     def handle_provider_zip(self, provider):
         pm = self.setup_plugins(provider)
         req_args = {k: v[0].decode() for k, v in self.request.arguments.items()}
@@ -58,6 +59,8 @@ def handle_provider_zip(self, provider):
         dl_thread.join()
         return dl_thread.result
 
+=======
+>>>>>>> non-git-updates
     @gen.coroutine
     def progress_loop(self, queue):
         while True:

setup.py

@@ -21,7 +21,7 @@
     packages=find_packages(),
     include_package_data=True,
     platforms='any',
-    install_requires=['notebook>=5.5.0', 'tornado', 'requests', 'requests-file'],
+    install_requires=['notebook>=5.5.0', 'tornado', 'aiohttp', 'aioresponses', 'pytest-asyncio'],
     data_files=[
         ('etc/jupyter/jupyter_notebook_config.d', ['nbgitpuller/etc/nbgitpuller.json'])
     ],

tests/test_download_puller.py

@@ -71,7 +71,10 @@ async def test_execute_unarchive(test_configuration):
     yield_str = ""
     async for line in ph.execute_unarchive("zip", archive_base + ".zip", temp_download_repo):
         yield_str += line
+<<<<<<< HEAD
     assert "inflating:" in yield_str
+=======
+>>>>>>> non-git-updates
     assert os.path.isfile("/tmp/download/hw/hw01/hw01.ipynb")
 
 
@@ -90,7 +93,10 @@ async def test_push_to_local_origin(test_configuration):
     async for line in ph.push_to_local_origin(temp_download_repo):
         yield_str += line
 
+<<<<<<< HEAD
     assert "create mode" in yield_str
+=======
+>>>>>>> non-git-updates
     assert "[new branch]" in yield_str