Merge branch 'v0.0.15_work'

Author: dandruszak

README.md

@@ -1,7 +1,7 @@
 Paperspace Python
 =================
 
-Release 0.0.14 
+Release 0.0.15
 
 See [releasenotes.md](https://github.com/Paperspace/paperspace-python/blob/master/releasenotes.md) for details on the current release, as well as release history.
 

conda/python2/paperspace/meta.yaml

@@ -1,37 +1,33 @@
 {% set name = "paperspace" %}
-{% set version = "0.0.14" %}
-{% set file_ext = "tar.gz" %}
-{% set hash_type = "sha256" %}
-{% set hash_value = "eaee7d09abdc1ee7b575250f5d127f1f874a2fa456ebb7c6ddee4a366356297c" %}
+{% set version = "0.0.15" %}
 
 package:
-  name: '{{ name|lower }}'
-  version: '{{ version }}'
+  name: "{{ name|lower }}"
+  version: "{{ version }}"
 
 source:
-  fn: '{{ name }}-{{ version }}.{{ file_ext }}'
-  url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.{{ file_ext }}
-  '{{ hash_type }}': '{{ hash_value }}'
+  url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
+  sha256: b43d8216354a6fce571f3c091cbf04a52603c6a52ddfa70a7be586ec67c9eea1
 
 build:
   number: 0
   entry_points:
     - paperspace-python = paperspace.main:main
-  script: python setup.py install --single-version-externally-managed --record=record.txt
+  script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv "
 
 requirements:
   host:
-    - python
-    - setuptools
-    - requests
     - boto3
     - botocore
-    - six
-  run:
+    - pip
     - python
     - requests
+    - six
+  run:
     - boto3
     - botocore
+    - python
+    - requests
     - six
 
 test:
@@ -42,13 +38,13 @@ test:
 
 about:
   home: https://github.com/paperspace/paperspace-python
-  license: ISC License (ISCL)
+  license: ISC (ISCL)
   license_family: OTHER
-  license_file: ''
+  license_file: 
   summary: Paperspace Python
-  description: "Paperspace Python"
-  doc_url: ''
-  dev_url: ''
+  doc_url: 
+  dev_url: 
 
 extra:
-  recipe-maintainers: ''
+  recipe-maintainers:
+    - your-github-id-here

conda/python3/paperspace/meta.yaml

@@ -1,37 +1,33 @@
 {% set name = "paperspace" %}
-{% set version = "0.0.14" %}
-{% set file_ext = "tar.gz" %}
-{% set hash_type = "sha256" %}
-{% set hash_value = "eaee7d09abdc1ee7b575250f5d127f1f874a2fa456ebb7c6ddee4a366356297c" %}
+{% set version = "0.0.15" %}
 
 package:
-  name: '{{ name|lower }}'
-  version: '{{ version }}'
+  name: "{{ name|lower }}"
+  version: "{{ version }}"
 
 source:
-  fn: '{{ name }}-{{ version }}.{{ file_ext }}'
-  url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.{{ file_ext }}
-  '{{ hash_type }}': '{{ hash_value }}'
+  url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
+  sha256: b43d8216354a6fce571f3c091cbf04a52603c6a52ddfa70a7be586ec67c9eea1
 
 build:
   number: 0
   entry_points:
     - paperspace-python = paperspace.main:main
-  script: python setup.py install --single-version-externally-managed --record=record.txt
+  script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv "
 
 requirements:
   host:
-    - python
-    - setuptools
-    - requests
     - boto3
     - botocore
-    - six
-  run:
+    - pip
     - python
     - requests
+    - six
+  run:
     - boto3
     - botocore
+    - python
+    - requests
     - six
 
 test:
@@ -42,13 +38,13 @@ test:
 
 about:
   home: https://github.com/paperspace/paperspace-python
-  license: ISC License (ISCL)
+  license: ISC (ISCL)
   license_family: OTHER
-  license_file: ''
+  license_file: 
   summary: Paperspace Python
-  description: "Paperspace Python"
-  doc_url: ''
-  dev_url: ''
+  doc_url: 
+  dev_url: 
 
 extra:
-  recipe-maintainers: ''
+  recipe-maintainers:
+    - your-github-id-here

paperspace/__init__.py

@@ -9,4 +9,4 @@
 from . import templates
 from . import users
 
-__version__ = "0.0.13"
+__version__ = "0.0.15"

paperspace/jobs.py

@@ -1,3 +1,4 @@
+import base64
 import inspect
 import json
 import os
@@ -414,6 +415,7 @@ def run(params={}, no_logging=False):
         print(params['command'])
         sys.exit(1)
 
+    params['command'] = base64.b64encode(bytes(params['command'], 'utf-8'))
     res = create(params, no_logging)
     if run_this:
         sys.exit(0)

paperspace/main.py

@@ -74,8 +74,10 @@ def main():
             elif opt.startswith('--') and not skip_arg_processing:
                 param = opt[2:]
                 if param in ['script', 'python', 'conda', 'ignoreFiles', 'apiKey', 'container', 'machineType', 'name',
-                    'project', 'projectId', 'command', 'workspace', 'dataset', 'registryUsername', 'registryPassword',
-                    'workspaceUsername', 'workspacePassword', 'cluster', 'clusterId', 'ports', 'isPreemptible']:
+                             'project', 'projectId', 'command', 'workspace', 'dataset', 'registryUsername',
+                             'registryPassword', 'workspaceUsername', 'workspacePassword', 'cluster', 'clusterId',
+                             'ports', 'isPreemptible', 'useDockerfile', 'buildOnly', 'registryTarget',
+                             'registryTargetUsername', 'registryTargetPassword', 'relDockerfilePath']:
                     if args and not args[0].startswith('--'):
                         params[param] = args.pop(0)
                     else:

paperspace/method.py

@@ -135,7 +135,8 @@ def method(category, method, params):
             data = params
             params = None
         r = requests.request(http_method, config.CONFIG_HOST + path,
-                             headers={'x-api-key': config.PAPERSPACE_API_KEY},
+                             headers={'x-api-key': config.PAPERSPACE_API_KEY, 'ps_client_name': 'paperspace-python', 
+                             'ps_client_version' : "0.0.15"},
                              params=params, data=data, files=files)
         #pprint(vars(r.request))
     except requests.exceptions.RequestException as e:

releasenotes.md

@@ -1,5 +1,17 @@
 # Paperspace Python Release Notes
 
+## Release Notes for v0.0.15
+
+### New features
+* Run gradient jobs from custom Dockerfile built containers (see: https://docs.paperspace.com/gradient/jobs/create-a-job#new-run-jobs-from-dockerfiles)
+
+* Push GPU-enabled container images to a registry of your choice 
+
+* Add support for yarn package manager 
+
+### Fixes
+* Add custom headers to requests 
+
 ## Release Notes for v0.0.14
 
 #### New features

setup.py

@@ -14,7 +14,7 @@
 
 setup(
     name='paperspace',
-    version='0.0.14',
+    version='0.0.15',
     description='Paperspace Python',
     long_description=long_description,
     url='https://github.com/paperspace/paperspace-python',