diff --git a/History.md b/History.md index ef943f5..dc20d46 100644 --- a/History.md +++ b/History.md @@ -1,3 +1,8 @@ + +0.6.1 / 2019-07-23 +================= + * Add ODS endpoint to supported endpoint list + 0.6.0 / 2017-06-19 ================== * Added: Python 3 compatibility @@ -23,7 +28,7 @@ 0.3.1 / 2013-06-04 ================== * Removed: Realm Support - * Realm can still be given, but has no effect + * Realm can still be given, but has no effect * Fixed: Unicode encoding error in REST POSTing 0.3.0 / 2013-03-18 diff --git a/ox3apiclient/__init__.py b/ox3apiclient/__init__.py index 8a9b1ee..55eec8a 100644 --- a/ox3apiclient/__init__.py +++ b/ox3apiclient/__init__.py @@ -12,7 +12,7 @@ import requests from requests_oauthlib import OAuth1 -__version__ = '0.6.0' +__version__ = '0.6.3' REQUEST_TOKEN_URL = 'https://sso.openx.com/api/index/initiate' ACCESS_TOKEN_URL = 'https://sso.openx.com/api/index/token' @@ -22,7 +22,7 @@ API_PATH_SSO = '/api' 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,) +JSON_PATHS = (API_PATH_V2,ODS_PATH_V1) HTTP_METHOD_OVERRIDES = ['DELETE', 'PUT', 'OPTIONS'] @@ -314,11 +314,11 @@ def _response_value(self, response): except ValueError: return response.text - def get(self, url): + def get(self, url, params=None): """Issue a GET request to the given URL or API shorthand """ - response = self._session.get(self._resolve_url(url), timeout=self.timeout) + response = self._session.get(self._resolve_url(url), params=params, timeout=self.timeout) self.log_request(response) response.raise_for_status() return self._response_value(response) diff --git a/requirements/dev.txt b/requirements/dev.txt index 81b9bca..e4af446 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,5 +1,5 @@ -mock -nose -requests -requests-oauthlib -six +mock==4.0.3 +nose==1.3.7 +requests==2.26.0 +requests-oauthlib==1.3.0 +six==1.16.0 diff --git a/setup.py b/setup.py index aa2256d..80b8a07 100755 --- a/setup.py +++ b/setup.py @@ -23,9 +23,10 @@ def read_file(name): platforms=['POSIX'], description='Client to connect to the OpenX Enterprise API.', long_description=read_file('README.md'), + long_description_content_type="text/markdown", packages=find_packages(), zip_safe=True, - install_requires=['six','requests_oauthlib'], + install_requires=['six==1.16.0', 'requests_oauthlib==1.3.0'], classifiers=[ 'Environment :: Console', 'Environment :: Web Environment', @@ -43,7 +44,7 @@ def read_file(name): ], test_suite='nose.collector', tests_require=[ - 'nose', - 'mock; python_version < "3.3"' + 'nose==1.3.7', + 'mock==2.0.0; python_version < "3.3"' ] )