Merge pull request #41 from openx/develop

Merging develop to master

Author: openx-rj

.gitignore

@@ -1,2 +1,6 @@
+/.eggs/
+/build/
+/dist/
+/ox3apiclient.egg-info/
 .ox3rc
 *.pyc

MANIFEST.in

@@ -0,0 +1,3 @@
+include History.md
+include LICENSE.txt
+include test/ox3rctest

ox3apiclient/__init__.py

@@ -20,7 +20,8 @@
 API_PATH_V1 = '/ox/3.0'
 API_PATH_V2 = '/ox/4.0'
 API_PATH_SSO = '/api'
-ACCEPTABLE_PATHS = (API_PATH_V1, API_PATH_V2, API_PATH_SSO)
+ODS_PATH_V1 = '/data/1.0'
+ACCEPTABLE_PATHS = (API_PATH_V1, API_PATH_V2, API_PATH_SSO, ODS_PATH_V1)
 JSON_PATHS = (API_PATH_V2,)
 HTTP_METHOD_OVERRIDES = ['DELETE', 'PUT', 'OPTIONS']
 

setup.cfg

@@ -1,2 +1,5 @@
+[bdist_wheel]
+universal=true
+
 [metadata]
 description-file=README.md

setup.py

@@ -2,22 +2,31 @@
 # -*- coding: utf-8 -*-
 from setuptools import setup, find_packages
 from os.path import dirname, join
+import os
 import re
 
+def read_file(name):
+    filename = join(dirname(__file__), name)
+    with open(filename) as fp:
+        return fp.read()
+
 file_path = join(dirname(__file__), 'ox3apiclient', '__init__.py')
 version = re.search("__version__\s*=\s*['\"](.+)['\"]",
                     open(file_path, 'r').read()).groups()[0]
 
 setup(name='ox3apiclient',
-      version=version,
-      author='OpenX API Team',
-      author_email='[email protected]',
-      url='https://github.com/openx/OX3-Python-API-Client',
-      description='Client to connect to the OpenX Enterprise API.',
-      long_description='',
-      packages=find_packages(),
-      install_requires=['six','requests_oauthlib'],
-      classifiers=[
+    version=version,
+    author='OpenX API Team',
+    author_email='[email protected]',
+    url='https://github.com/openx/OX3-Python-API-Client',
+    license='BSD',
+    platforms=['POSIX'],
+    description='Client to connect to the OpenX Enterprise API.',
+    long_description=read_file('README.md'),
+    packages=find_packages(),
+    zip_safe=True,
+    install_requires=['six','requests_oauthlib'],
+    classifiers=[
         'Environment :: Console',
         'Environment :: Web Environment',
         'Intended Audience :: Developers',
@@ -32,4 +41,9 @@
         'Topic :: Software Development :: Libraries',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
+    test_suite='nose.collector',
+    tests_require=[
+        'nose',
+        'mock; python_version < "3.3"'
+    ]
 )