From 991cc27e30754a2f082beef6df4f36c25001c0ec Mon Sep 17 00:00:00 2001 From: Francesco Siddi Date: Mon, 31 Aug 2015 19:25:01 +0200 Subject: [PATCH] Renaming to Pillar SDK. --- LICENSE.md | 2 +- README.md | 4 ++-- attractsdk/config.py | 5 ----- {attractsdk => pillarsdk}/__init__.py | 0 {attractsdk => pillarsdk}/api.py | 8 ++++---- {attractsdk => pillarsdk}/binary_files.py | 0 pillarsdk/config.py | 5 +++++ {attractsdk => pillarsdk}/exceptions.py | 0 {attractsdk => pillarsdk}/files.py | 0 {attractsdk => pillarsdk}/groups.py | 0 {attractsdk => pillarsdk}/nodes.py | 0 {attractsdk => pillarsdk}/organizations.py | 0 {attractsdk => pillarsdk}/resource.py | 2 +- {attractsdk => pillarsdk}/tokens.py | 0 {attractsdk => pillarsdk}/users.py | 0 {attractsdk => pillarsdk}/utils.py | 8 ++++---- setup.py | 10 +++++----- 17 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 attractsdk/config.py rename {attractsdk => pillarsdk}/__init__.py (100%) rename {attractsdk => pillarsdk}/api.py (96%) rename {attractsdk => pillarsdk}/binary_files.py (100%) create mode 100644 pillarsdk/config.py rename {attractsdk => pillarsdk}/exceptions.py (100%) rename {attractsdk => pillarsdk}/files.py (100%) rename {attractsdk => pillarsdk}/groups.py (100%) rename {attractsdk => pillarsdk}/nodes.py (100%) rename {attractsdk => pillarsdk}/organizations.py (100%) rename {attractsdk => pillarsdk}/resource.py (99%) rename {attractsdk => pillarsdk}/tokens.py (100%) rename {attractsdk => pillarsdk}/users.py (100%) rename {attractsdk => pillarsdk}/utils.py (79%) diff --git a/LICENSE.md b/LICENSE.md index 6837cdc..f7d8b93 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -The Attract Python SDK is released under the BSD License: +The Pillar Python SDK is released under the BSD License: Copyright (c) 2015, Blender Foundation Copyright (c) 2013-2014, PayPal diff --git a/README.md b/README.md index b0d0507..9f70564 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -# Attract Python REST SDK -Integrate this module in your Python app to communicate with an Attract server. +# Pillar Python REST SDK +Integrate this module in your Python app to communicate with an Pillar server. diff --git a/attractsdk/config.py b/attractsdk/config.py deleted file mode 100644 index b5f2998..0000000 --- a/attractsdk/config.py +++ /dev/null @@ -1,5 +0,0 @@ -__version__ = "0.0.1" -__pypi_username__ = "fsiddi" -__pypi_packagename__ = "attract-sdk" -__github_username__ = "fsiddi" -__github_reponame__ = "Attract-Python-SDK" diff --git a/attractsdk/__init__.py b/pillarsdk/__init__.py similarity index 100% rename from attractsdk/__init__.py rename to pillarsdk/__init__.py diff --git a/attractsdk/api.py b/pillarsdk/api.py similarity index 96% rename from attractsdk/api.py rename to pillarsdk/api.py index c62175e..da324fc 100644 --- a/attractsdk/api.py +++ b/pillarsdk/api.py @@ -15,7 +15,7 @@ class Api(object): # User-Agent for HTTP request library_details = "requests {0}; python {1}".format( requests.__version__, platform.python_version()) - user_agent = "Attract-Python-SDK/{0} ({1})".format( + user_agent = "Pillar-Python-SDK/{0} ({1})".format( __version__, library_details) _api_singleton = None def __init__(self, options=None, **kwargs): @@ -23,7 +23,7 @@ class Api(object): Usage:: - >>> from attractsdk import Api + >>> from pillarsdk import Api >>> Api.Default( endpoint="http://localhost:5000", username='USERNAME', @@ -94,8 +94,8 @@ class Api(object): http_headers = utils.merge_dict(self.headers(), headers or {}) - if http_headers.get('Attract-Request-Id'): - logging.info("Attract-Request-Id: {0}".format(http_headers['Attract-Request-Id'])) + if http_headers.get('Pillar-Request-Id'): + logging.info("Pillar-Request-Id: {0}".format(http_headers['Pillar-Request-Id'])) try: # Support for Multipart-Encoded file upload if files and method in ['POST', 'PUT', 'PATCH']: diff --git a/attractsdk/binary_files.py b/pillarsdk/binary_files.py similarity index 100% rename from attractsdk/binary_files.py rename to pillarsdk/binary_files.py diff --git a/pillarsdk/config.py b/pillarsdk/config.py new file mode 100644 index 0000000..64a14df --- /dev/null +++ b/pillarsdk/config.py @@ -0,0 +1,5 @@ +__version__ = "0.0.1" +__pypi_username__ = "armadillica" +__pypi_packagename__ = "pillar-sdk" +__github_username__ = "armadillica" +__github_reponame__ = "Pillar-Python-SDK" diff --git a/attractsdk/exceptions.py b/pillarsdk/exceptions.py similarity index 100% rename from attractsdk/exceptions.py rename to pillarsdk/exceptions.py diff --git a/attractsdk/files.py b/pillarsdk/files.py similarity index 100% rename from attractsdk/files.py rename to pillarsdk/files.py diff --git a/attractsdk/groups.py b/pillarsdk/groups.py similarity index 100% rename from attractsdk/groups.py rename to pillarsdk/groups.py diff --git a/attractsdk/nodes.py b/pillarsdk/nodes.py similarity index 100% rename from attractsdk/nodes.py rename to pillarsdk/nodes.py diff --git a/attractsdk/organizations.py b/pillarsdk/organizations.py similarity index 100% rename from attractsdk/organizations.py rename to pillarsdk/organizations.py diff --git a/attractsdk/resource.py b/pillarsdk/resource.py similarity index 99% rename from attractsdk/resource.py rename to pillarsdk/resource.py index 2c58b1d..ccf6eb2 100644 --- a/attractsdk/resource.py +++ b/pillarsdk/resource.py @@ -31,7 +31,7 @@ class Resource(object): """Generate HTTP header """ return utils.merge_dict(self.header, self.headers, - {'Attract-Request-Id': self.generate_request_id()}) + {'Pillar-Request-Id': self.generate_request_id()}) def __str__(self): return self.__data__.__str__() diff --git a/attractsdk/tokens.py b/pillarsdk/tokens.py similarity index 100% rename from attractsdk/tokens.py rename to pillarsdk/tokens.py diff --git a/attractsdk/users.py b/pillarsdk/users.py similarity index 100% rename from attractsdk/users.py rename to pillarsdk/users.py diff --git a/attractsdk/utils.py b/pillarsdk/utils.py similarity index 79% rename from attractsdk/utils.py rename to pillarsdk/utils.py index a948807..cb3e980 100644 --- a/attractsdk/utils.py +++ b/pillarsdk/utils.py @@ -12,8 +12,8 @@ def join_url(url, *paths): Usage:: - >>> utils.join_url("attract:5000", "shots") - attract:5000/shots + >>> utils.join_url("pillar:5000", "shots") + pillar:5000/shots """ for path in paths: url = re.sub(r'/?$', re.sub(r'^/?', '/', path), url) @@ -25,8 +25,8 @@ def join_url_params(url, params): Usage:: - >>> utils.join_url_params("attract:5000/shots", {"page-id": 2, "NodeType": "Shot Group"}) - attract:5000/shots?page-id=2&NodeType=Shot+Group + >>> utils.join_url_params("pillar:5000/shots", {"page-id": 2, "NodeType": "Shot Group"}) + pillar:5000/shots?page-id=2&NodeType=Shot+Group """ return url + "?" + urlencode(params) diff --git a/setup.py b/setup.py index bae5e89..4c7b5ab 100644 --- a/setup.py +++ b/setup.py @@ -2,11 +2,11 @@ from distutils.core import setup import sys, os -sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'attractsdk')) +sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'pillarsdk')) from config import __version__, __pypi_packagename__, __github_username__, __github_reponame__ long_description=""" - The Attract REST SDK provides Python APIs to communicate to the Attract webservices. + The Pillar REST SDK provides Python APIs to communicate to the Pillar webservices. """ # license='Free BSD' @@ -20,11 +20,11 @@ setup( version= __version__, author='Francesco Siddi, PayPal', author_email='francesco@blender.org', - packages=['attractsdk'], + packages=['pillarsdk'], scripts=[], url=url, license='BSD License', - description='The Attract REST SDK provides Python APIs to communicate to the Attract webservices.', + description='The Pillar REST SDK provides Python APIs to communicate to the Pillar webservices.', long_description=long_description, install_requires=['requests>=1.0.0', 'six>=1.0.0', 'pyopenssl>=0.14'], classifiers=[ @@ -36,5 +36,5 @@ setup( 'Programming Language :: Python :: 2.7', 'Topic :: Software Development :: Libraries :: Python Modules' ], - keywords=['attract', 'rest', 'sdk', 'tracking', 'film', 'production'] + keywords=['pillar', 'rest', 'sdk', 'tracking', 'film', 'production'] )