Skip to content

Commit 59b538a

Browse files
committed
Revert "Revert "API-3199 submit client to PyPI [not merge]""
This reverts commit 2b6a442.
1 parent f2fa5b9 commit 59b538a

File tree

6 files changed

+55
-2
lines changed

6 files changed

+55
-2
lines changed

History.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
0.5.1 / 2013-08-11
2+
==================
3+
* Fixed: packaging for Pypi
4+
* Added: license information
5+
16
0.5.0 / 2013-06-09
27
==================
38
* Replaced: urllib2 with requests package

LICENSE.txt

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
Software Copyright License Agreement (BSD License)
2+
3+
Copyright (c) 2016, OpenX Technologies, Inc.
4+
All rights reserved.
5+
6+
Redistribution and use of this software in source and binary forms,
7+
with or without modification, are permitted provided that the following
8+
conditions are met:
9+
10+
* Redistributions of source code must retain the above
11+
copyright notice, this list of conditions and the
12+
following disclaimer.
13+
14+
* Redistributions in binary form must reproduce the above
15+
copyright notice, this list of conditions and the
16+
following disclaimer in the documentation and/or other
17+
materials provided with the distribution.
18+
19+
* Neither the name of OpenX Technologies, Inc. nor the names of its
20+
contributors may be used to endorse or promote products
21+
derived from this software without specific prior
22+
written permission of OpenX Technologies, Inc.
23+
24+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
25+
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
26+
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
27+
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
28+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
29+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
30+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
31+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
32+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
33+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
34+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35+

README.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,17 @@ ox.logoff()
4545

4646
## Installation
4747

48-
ox3apiclient is currently unavailable at [PyPi](http://pypi.python.org/pypi) so just clone our git repo:
48+
From Pypi
49+
50+
The last released version (from the master branch) is available at [PyPi](http://pypi.python.org/pypi)
51+
````
52+
$ pip install ox3apiclient
53+
````
54+
55+
56+
From Github:
57+
58+
Just clone our git repo:
4959

5060
````
5161
$ git clone https://github.com/openx/OX3-Python-API-Client.git

ox3apiclient/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import requests
1313
from requests_oauthlib import OAuth1
1414

15-
__version__ = '0.5.0'
15+
__version__ = '0.5.1'
1616

1717
REQUEST_TOKEN_URL = 'https://sso.openx.com/api/index/initiate'
1818
ACCESS_TOKEN_URL = 'https://sso.openx.com/api/index/token'

setup.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[metadata]
2+
description-file=README.md

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
'Environment :: Web Environment',
2626
'Intended Audience :: Developers',
2727
'Operating System :: OS Independent',
28+
'License :: OSI Approved :: BSD License',
2829
'Programming Language :: Python',
2930
'Programming Language :: Python :: 2.6',
3031
'Programming Language :: Python :: 2.7',

0 commit comments

Comments
 (0)