Merge pull request #6 from giannisdoukas/dev

Dev

Author: giannisdoukas

README.md

@@ -39,3 +39,7 @@ pip install ipython2cwl
 ```
 jupyter repo2cwl https://github.com/giannisdoukas/cwl-annotated-jupyter-notebook.git -o cwlbuild
 ```
+
+### Docs
+
+[https://ipython2cwl.readthedocs.io/](https://readthedocs.org/projects/ipython2cwl/badge/?version=latest)

ipython2cwl/ipython2cwl.py

@@ -72,7 +72,7 @@ def _store_jn_as_script(notebook_path: str, git_directory_absolute_path: str, bi
 def existing_path(path: str):
     path = Path(path)
     if not path.is_dir():
-        raise ValueError('Directory does not exists')
+        raise argparse.ArgumentTypeError(f'Directory: {str(path)} does not exists')
     return path
 
 

ipython2cwl/repo2cwl.py

@@ -38,19 +38,27 @@ def get_version(rel_path):
     long_description_content_type="text/markdown",
     python_requires='>=3.6',
     classifiers=[
-        "Programming Language :: Python :: 3",
-        "License :: OSI Approved :: Apache Software License",
-        "Operating System :: MacOS",
-        "Operating System :: POSIX",
-        "Development Status :: 2 - Pre-Alpha",
-        "Framework :: IPython",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
+        'Development Status :: 3 - Alpha',
+        'Environment :: Console',
+        'Framework :: IPython',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Science/Research',
+        'License :: OSI Approved :: Apache Software License',
+        'Operating System :: MacOS',
+        'Operating System :: POSIX',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Topic :: Scientific/Engineering',
+        'Topic :: Scientific/Engineering :: Astronomy',
+        'Topic :: Scientific/Engineering :: Atmospheric Science',
+        'Topic :: Scientific/Engineering :: Bio-Informatics',
+        'Topic :: Scientific/Engineering :: Information Analysis',
+        'Topic :: Scientific/Engineering :: Medical Science Apps.'
     ],
     entry_points={
         'console_scripts': [
-            # 'jupyter-jn2cwl=ipython2cwl.ipython2cwl:main',
             'jupyter-repo2cwl=ipython2cwl.repo2cwl:repo2cwl',
         ],
     },

setup.py

@@ -1,6 +1,7 @@
 import os
 import shutil
 import tempfile
+import uuid
 from subprocess import DEVNULL
 from unittest import TestCase, skipIf
 
@@ -47,3 +48,9 @@ def test_repo2cwl(self):
             new_data = yaml.safe_load(f)
         self.assertDictEqual({'entry1': 2, 'entry2': 'foo', 'entry3': 'bar'}, new_data)
         shutil.rmtree(output_dir)
+
+    def test_repo2cwl_output_dir_does_not_exists(self):
+        random_dir_name = str(uuid.uuid4())
+        repo2cwl = pkg_resources.load_entry_point('ipython2cwl', 'console_scripts', 'jupyter-repo2cwl')
+        with self.assertRaises(SystemExit):
+            repo2cwl(['-o', random_dir_name, self.repo_like_dir])