Merge branch 'master' into release/0.11

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.11.6
+current_version = 0.11.7
 commit = True
 tag = False
 

conda/meta.yaml

@@ -1,5 +1,5 @@
 {% set name = "floyd-cli" %}
-{% set version = "0.11.6" %}
+{% set version = "0.11.7" %}
 {% set file_ext = "tar.gz" %}
 
 package:

floyd/cli/utils.py

@@ -66,6 +66,10 @@ def normalize_data_name(raw_name, default_username='', default_dataset_name='',
     raw_name = raw_name or ''
     if raw_name.endswith('/output'):
         return normalize_job_name(raw_name[:-len('/output')], default_username, default_dataset_name) + '/output'
+    elif raw_name.endswith('/home'):
+        return normalize_job_name(raw_name[:-len('/home')], default_username, default_dataset_name) + '/home'
+    elif '/projects/' in raw_name:
+        return normalize_job_name(raw_name, default_username, default_dataset_name)
 
     name_parts = raw_name.split('/')
 

floyd/development/local.py

@@ -12,9 +12,9 @@ def cli(verbose):
     Floyd CLI interacts with FloydHub server and executes your commands.
     More help is available under each command listed below.
     """
-    floyd.floyd_host = "https://127.0.0.1:8080"
+    floyd.floyd_host = "http://127.0.0.1:8080"
     floyd.floyd_web_host = "https://127.0.0.1:3000"
-    floyd.tus_server_endpoint = "https://127.0.0.1:1080"
+    floyd.tus_server_endpoint = "http://127.0.0.1:1080"
     configure_logger(verbose)
     check_cli_version()
 

setup.py

@@ -3,7 +3,7 @@
 from setuptools import find_packages, setup
 
 project = "floyd-cli"
-version = "0.11.6"
+version = "0.11.7"
 
 with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as readme:
     long_description = readme.read()

tests/cli/utils_test.py

@@ -35,7 +35,7 @@ def test_normalize_data_name(self, _0, _1, _2, _3, mock_get_config):
         assert normalize_data_name('1', 'yoyo', 'ma') == 'yoyo/datasets/ma/1'
 
         # Full job names are returned unchanged
-        assert normalize_data_name('foo/projects/bar/1') == 'foo/datasets/bar/1'
+        assert normalize_data_name('foo/projects/bar/1') == 'foo/projects/bar/1'
 
         # If no job number is passed, it is not used
         assert normalize_data_name('foo/datasets/bar') == 'foo/datasets/bar'