Merge branch 'master' of https://github.com/biosustain/potion-client

# Conflicts: # .travis.yml # README.rst # potion_client/__init__.py # potion_client/collection.py # potion_client/converter.py # setup.py # tests/test_init_client.py
biosustain · Apr 8, 2016 · 2a52559 · 2a52559
1 parent 7a99ecf
commit 2a52559
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/potion_client/__init__.py b/potion_client/__init__.py
@@ -23,10 +23,6 @@ def __init__(self, api_root_url, schema_path='/schema', fetch_schema=True, **ses
             setattr(session, key, value)
 
         parse_result = urlparse(api_root_url)
-<<<<<<< HEAD
-=======
-        # FIXME include port, if given
->>>>>>> f9ce5e36af2016576db77a8ee9df3d5d651e5ef2
         self._root_url = '{}://{}'.format(parse_result.scheme, parse_result.netloc)
         self._api_root_url = api_root_url  # '{}://{}'.format(parse_result.scheme, parse_result.netloc)
         self._root_path = parse_result.path

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 setup(
     name='Potion-client',
-    version='2.1.0',
+    version='2.1.1',
     packages=[str('potion_client')],  # https://bugs.python.org/issue13943
     url='https://github.com/biosustain/potion-client',
     license='MIT',