Merge pull request #51 from vsoch/wkpalan-master

Wkpalan master

Author: vsoch

.travis/before_install

@@ -18,5 +18,5 @@ which python
 python setup.py sdist && python setup.py install
 
 # Install Singularity (development)
-cd /tmp && git clone https://github.com/singularityware/singularity.git && cd singularity && ./autogen.sh && ./configure --prefix=/usr/local && make && sudo make install
+cd /tmp && git clone -b vault/release-2.5 https://github.com/singularityware/singularity.git && cd singularity && ./autogen.sh && ./configure --prefix=/usr/local && make && sudo make install
 

CHANGELOG.md

@@ -17,6 +17,8 @@ The client here will eventually be released as "spython" (and eventually to
 singularity on pypi), and the versions here will coincide with these releases.
 
 ## [master](https://github.com/singularityhub/singularity-cli/tree/master)
+ - remove uri function should only right strip to support relative paths (0.0.39)
+ - adjusting container build to use correct Github branch (vault/release-2.5)
  - adding support and documentation for container instances (0.0.38)
  - fixing bug with recipe Dockerfile conversion (0.0.37)
  - typo in pypi PACKAGE_URL (0.0.36)

spython/image/__init__.py

@@ -56,7 +56,7 @@ def remove_uri(self, image):
         image = image or ''
         uri = self.get_uri(image) or ''
         image = image.replace('%s://' %uri,'', 1)
-        return image.strip('-').strip('/')
+        return image.strip('-').rstrip('/')
 
 
     def parse_image_name(self, image):

spython/version.py

@@ -18,7 +18,7 @@
 
 
 
-__version__ = "0.0.38"
+__version__ = "0.0.39"
 AUTHOR = 'Vanessa Sochat'
 AUTHOR_EMAIL = '[email protected]'
 NAME = 'spython'