diff --git a/.travis.yml b/.travis.yml index 6a85dd5..68b6589 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,9 @@ language: python +dist: xenial +# Reflect version changes in setup.py classifiers +# 2.7 EOL - January 2020 +# 3.4 EOL - March 2019 +# RCB-562 for 3.7 support python: - "2.7" - "3.4" diff --git a/LICENSE.txt b/LICENSE.txt index 8e1eca0..5723e02 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2014-2016 Basis Technology Corporation. +Copyright (c) 2014-2019 Basis Technology Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/README.md b/README.md index 60462a6..a948bd1 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ -[![Build Status](https://travis-ci.org/rosette-api/python.svg?branch=develop)](https://travis-ci.org/rosette-api/python) +[![Build Status](https://travis-ci.org/rosette-api/python.svg?branch=develop)](https://travis-ci.org/rosette-api/python) [![PyPI version](https://badge.fury.io/py/rosette_api.svg)](https://badge.fury.io/py/rosette_api) ## This is the Python client binding for Rosette API. -Please check out the [wiki](https://github.com/rosette-api/python/wiki) for additional information +You can get an API Key and learn more [here](https://developer.rosette.com). +For more detailed information check out our [features and functions page](https://developer.rosette.com/features-and-functions). ### Installation @@ -33,28 +34,27 @@ For help in how to call the various endpoints, please refer to the [examples](ht - name translation - ping - relationships +- semantic similarity +- semantic vectors - sentences - sentiment - syntax dependencies -- text embedding - tokens - topics - transliteration +### API Documentation +See [documentation](http://rosette-api.github.io/python) + +### Release Notes +See [wiki](https://github.com/rosette-api/python/wiki/Release-Notes) + ### Docker A Docker image for running the examples against the compiled source library is available on Docker Hub. Command: `docker run -e API_KEY=api-key -v ":/source" rosetteapi/docker-python` Additional environment settings: -`-e ALT_URL=` -`-e FILENAME=` - -### API Documentation -See [documentation](http://rosette-api.github.io/python) - -### Release Notes -See [wiki](https://github.com/rosette-api/python/wiki/Release-Notes) +- `-e ALT_URL=` +- `-e FILENAME=` -### Additional Information -Visit [Rosette API site](https://developer.rosette.com) diff --git a/docs/source/conf.py b/docs/source/conf.py index 58fd9b9..87f7fcc 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -47,7 +47,7 @@ # General information about the project. project = '' -copyright = '2017, Basis Technology' +copyright = '2019, Basis Technology' author = 'Basis Technology' # The version info for the project you're documenting, acts as replacement for diff --git a/rosette/__init__.py b/rosette/__init__.py index b04d320..fff5933 100644 --- a/rosette/__init__.py +++ b/rosette/__init__.py @@ -1,6 +1,6 @@ """ Python client for the Rosette API. -Copyright (c) 2014-2015 Basis Technology Corporation. +Copyright (c) 2014-2019 Basis Technology Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/rosette/api.py b/rosette/api.py index 2c76b33..892fb7e 100644 --- a/rosette/api.py +++ b/rosette/api.py @@ -3,7 +3,7 @@ """ Python client for the Rosette API. -Copyright (c) 2014-2017 Basis Technology Corporation. +Copyright (c) 2014-2019 Basis Technology Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/setup.py b/setup.py index 0a8f59b..10a57e0 100755 --- a/setup.py +++ b/setup.py @@ -8,8 +8,8 @@ NAME = "rosette_api" DESCRIPTION = "Rosette API Python client SDK" AUTHOR = "Basis Technology Corp." -AUTHOR_EMAIL = "rosette_api@basistech.com" -HOMEPAGE = "https://developer.rosette.com" +AUTHOR_EMAIL = "support@rosette.com" +HOMEPAGE = "https://github.com/rosette-api/python" VERSION = rosette.__version__ HERE = os.path.abspath(os.path.dirname(__file__)) @@ -28,23 +28,31 @@ def read(*filenames, **kwargs): LONG_DESCRIPTION = read('README.md') -setup(name=NAME, - author=AUTHOR, - author_email=AUTHOR_EMAIL, - description=DESCRIPTION, - license='Apache License', - long_description=LONG_DESCRIPTION, - packages=['rosette'], - install_requires=['requests'], - platforms='any', - url=HOMEPAGE, - version=VERSION, - classifiers=[ - 'Programming Language :: Python', - 'Development Status :: 4 - Beta', - 'Natural Language :: English', - 'Environment :: Web Environment', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: OS Independent', - 'Topic :: Software Development :: Libraries :: Python Modules']) +setup( + name=NAME, + author=AUTHOR, + author_email=AUTHOR_EMAIL, + description=DESCRIPTION, + license='Apache License', + long_description=LONG_DESCRIPTION, + long_description_content_type='text/markdown', + packages=['rosette'], + install_requires=['requests'], + platforms='any', + url=HOMEPAGE, + version=VERSION, + classifiers=[ + 'Development Status :: 5 - Production/Stable', + 'Environment :: Web Environment', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: Apache Software License', + 'Natural Language :: English', + 'Operating System :: OS Independent', + 'Programming Language :: Python', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Topic :: Software Development :: Libraries :: Python Modules' + ] +) diff --git a/tests/__init__.py b/tests/__init__.py index d96e183..9d1fe1d 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ -Copyright (c) 2014-2017 Basis Technology Corporation. +Copyright (c) 2014-2019 Basis Technology Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tests/test_rosette_api.py b/tests/test_rosette_api.py index cd0611f..256283a 100644 --- a/tests/test_rosette_api.py +++ b/tests/test_rosette_api.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ -Copyright (c) 2014-2017 Basis Technology Corporation. +Copyright (c) 2014-2019 Basis Technology Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.