From 59b538a16792c0fff054af51f20f107d4b1457d0 Mon Sep 17 00:00:00 2001 From: Luis Armendariz Date: Tue, 7 Feb 2017 16:18:03 -0800 Subject: [PATCH 1/2] Revert "Revert "API-3199 submit client to PyPI [not merge]"" This reverts commit 2b6a442ffcfc26960a404a89db87dd5ff1008bae. --- History.md | 5 +++++ LICENSE.txt | 35 +++++++++++++++++++++++++++++++++++ README.md | 12 +++++++++++- ox3apiclient/__init__.py | 2 +- setup.cfg | 2 ++ setup.py | 1 + 6 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 LICENSE.txt create mode 100644 setup.cfg diff --git a/History.md b/History.md index 06fa7d0..22f5533 100644 --- a/History.md +++ b/History.md @@ -1,3 +1,8 @@ +0.5.1 / 2013-08-11 +================== + * Fixed: packaging for Pypi + * Added: license information + 0.5.0 / 2013-06-09 ================== * Replaced: urllib2 with requests package diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..ea77d76 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,35 @@ +Software Copyright License Agreement (BSD License) + +Copyright (c) 2016, OpenX Technologies, Inc. +All rights reserved. + +Redistribution and use of this software in source and binary forms, +with or without modification, are permitted provided that the following +conditions are met: + +* Redistributions of source code must retain the above + copyright notice, this list of conditions and the + following disclaimer. + +* Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the + following disclaimer in the documentation and/or other + materials provided with the distribution. + +* Neither the name of OpenX Technologies, Inc. nor the names of its + contributors may be used to endorse or promote products + derived from this software without specific prior + written permission of OpenX Technologies, Inc. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/README.md b/README.md index 7865bb6..ec80c88 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,17 @@ ox.logoff() ## Installation -ox3apiclient is currently unavailable at [PyPi](http://pypi.python.org/pypi) so just clone our git repo: +From Pypi + +The last released version (from the master branch) is available at [PyPi](http://pypi.python.org/pypi) +```` +$ pip install ox3apiclient +```` + + +From Github: + +Just clone our git repo: ```` $ git clone https://github.com/openx/OX3-Python-API-Client.git diff --git a/ox3apiclient/__init__.py b/ox3apiclient/__init__.py index 46d7738..868e676 100644 --- a/ox3apiclient/__init__.py +++ b/ox3apiclient/__init__.py @@ -12,7 +12,7 @@ import requests from requests_oauthlib import OAuth1 -__version__ = '0.5.0' +__version__ = '0.5.1' REQUEST_TOKEN_URL = 'https://sso.openx.com/api/index/initiate' ACCESS_TOKEN_URL = 'https://sso.openx.com/api/index/token' diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..12871ff --- /dev/null +++ b/setup.cfg @@ -0,0 +1,2 @@ +[metadata] +description-file=README.md diff --git a/setup.py b/setup.py index e948d1a..8b0b3e4 100644 --- a/setup.py +++ b/setup.py @@ -25,6 +25,7 @@ 'Environment :: Web Environment', 'Intended Audience :: Developers', 'Operating System :: OS Independent', + 'License :: OSI Approved :: BSD License', 'Programming Language :: Python', 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', From c61bb79f3be2ce9bbf6833edba14ff2c124b478d Mon Sep 17 00:00:00 2001 From: Luis Armendariz Date: Wed, 8 Feb 2017 14:53:36 -0800 Subject: [PATCH 2/2] Updated setup.py --- History.md | 2 +- ox3apiclient/__init__.py | 2 +- setup.py | 33 ++++++++++++++++----------------- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/History.md b/History.md index 22f5533..3c3e475 100644 --- a/History.md +++ b/History.md @@ -1,4 +1,4 @@ -0.5.1 / 2013-08-11 +0.5.2 / 2017-02-02 ================== * Fixed: packaging for Pypi * Added: license information diff --git a/ox3apiclient/__init__.py b/ox3apiclient/__init__.py index 868e676..712a67c 100644 --- a/ox3apiclient/__init__.py +++ b/ox3apiclient/__init__.py @@ -12,7 +12,7 @@ import requests from requests_oauthlib import OAuth1 -__version__ = '0.5.1' +__version__ = '0.5.2' REQUEST_TOKEN_URL = 'https://sso.openx.com/api/index/initiate' ACCESS_TOKEN_URL = 'https://sso.openx.com/api/index/token' diff --git a/setup.py b/setup.py index 8b0b3e4..323f9db 100644 --- a/setup.py +++ b/setup.py @@ -1,9 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -try: - from setuptools import setup -except ImportError: - from distutils.core import setup +from setuptools import setup, find_packages from os.path import dirname, join import re @@ -18,18 +15,20 @@ url='https://github.com/openx/OX3-Python-API-Client', description='Client to connect to OpenX Enterprise API.', long_description='Client to connect to OpenX Enterprise API.', - packages=['ox3apiclient'], + packages=find_packages(), install_requires=['requests_oauthlib'], classifiers=[ - 'Environment :: Console', - 'Environment :: Web Environment', - 'Intended Audience :: Developers', - 'Operating System :: OS Independent', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python', - 'Programming Language :: Python :: 2.6', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: Implementation :: CPython', - 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', - 'Topic :: Software Development :: Libraries', - 'Topic :: Software Development :: Libraries :: Python Modules']) + 'Environment :: Console', + 'Environment :: Web Environment', + 'Intended Audience :: Developers', + 'Operating System :: OS Independent', + 'License :: OSI Approved :: BSD License', + 'Programming Language :: Python', + 'Programming Language :: Python :: 2.6', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: Implementation :: CPython', + 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', + 'Topic :: Software Development :: Libraries', + 'Topic :: Software Development :: Libraries :: Python Modules', + ], +)