Merge pull request #142 from Paperspace/merge-to-master

Merge to master

Author: mkulaczkowski

gradient/api_sdk/utils.py

@@ -58,7 +58,6 @@ def print_dict_recursive(input_dict, logger, indent=0, tabulator="  "):
             logger.log("%s%s" % (tabulator * (indent + 1), val))
 
 
-<<<<<<< HEAD
 class ExperimentsClientHelpersMixin(object):
     def _get_experiment_type_id(self, value):
         if isinstance(value, int):
@@ -72,8 +71,6 @@ def _get_experiment_type_id(self, value):
         return experiment_type_id
 
 
-=======
->>>>>>> v0.4.0a5
 def base64_encode(s):
     if six.PY3:
         s = bytes(s, encoding="utf8")
@@ -89,11 +86,8 @@ def base64_encode(s):
 def base64_encode_attribute(data, name):
     encoded_value = base64_encode(getattr(data, name))
     setattr(data, name, encoded_value)
-<<<<<<< HEAD
 
 
 def urljoin(base, url):
     url = urljoin_original(base, url)
     return str(url)
-=======
->>>>>>> v0.4.0a5

gradient/commands/deployments.py

@@ -35,14 +35,11 @@ def execute(self, use_vpc=False, **kwargs):
             deployment_id = self.deployment_client.create(use_vpc=use_vpc, **kwargs)
 
         self.logger.log("New deployment created with id: {}".format(deployment_id))
-<<<<<<< HEAD
         self.logger.log(self.get_instance_url(deployment_id))
 
     def get_instance_url(self, instance_id):
         url = urljoin(config.WEB_URL, "/console/deployments/{}".format(instance_id))
         return url
-=======
->>>>>>> v0.4.0a5
 
 
 class ListDeploymentsCommand(_DeploymentCommand):

releasenotes.md

@@ -9,6 +9,20 @@
 ### Fixes
 * Fix how some error messages are printed
 
+# Release Notes for 0.3.7
+### Fixes
+* Fix formatting of datetime in `projects list` table
+* Fix sending some bash commands using `--*command` options caused Cloudflare's filter to stop request
+
+# Release Notes for 0.4.0a4
+### Fixes
+* Fix how some error messages are printed
+
+# Release Notes for 0.3.6
+### Fixes
+* Fix `job delete` and `job stop` commands
+* Fix how some error messages are printed
+
 # Release Notes for 0.4.0a3
 ### New features
 * Command for deleting a tensorboard
@@ -21,6 +35,18 @@
 * Fix StopIteration exception in Python 3.7
 * Fix `job delete` and `job stop` commands
 
+# Release Notes for 0.3.5
+### Fixes
+* Fix StopIteration exception in Python 3.7
+
+# Release Notes for 0.3.4
+### Fixes
+* Fixed bug causing exception be raised when `--help` option was used with some commands (like `gradient run`)
+
+# Release Notes for 0.3.3
+### Fixes
+* ~~Fixed bug causing exception be raised when `--help` option was used with some commands (like `gradient run`)~~
+
 # Release Notes for 0.3.2a
 ### New features
 * Support for tensorboard
@@ -31,6 +57,10 @@
     * Remove experiments from existing tensorboard
 * Add support for experiments workspace credentials
 
+# Release Notes for 0.3.2
+### Fixes
+* Fixed bug raising exception when `experiment create's` `--ignoreFiles` option was used
+
 # Release Notes for 0.3.1
 ### Fixes
 * Fixed bug preventing showing logs when 'experiments run' was executed

tests/functional/test_hyperparameters.py

@@ -276,11 +276,7 @@ class TestCreateAndStartHyperparameters(object):
         "tuningCommand": "c29tZSBjb21tYW5k",
         "workerCount": 1,
         "workerCommand": "c29tZSB3b3JrZXIgY29tbWFuZA==",
-<<<<<<< HEAD
         "projectHandle": "some_project_id",
-=======
-        "projectHandle": "pr4yxj956",
->>>>>>> v0.4.0a5
         "experimentTypeId": constants.ExperimentType.HYPERPARAMETER_TUNING,
     }