Skip to content

Devel to master #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
srautiai merged 5 commits into from
Jan 8, 2019
Merged

Devel to master #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
744bedd
Merge pull request #109 from lex/feature/access-groups
Jan 2, 2019
f7b7bc0
deploy to pypi
Jan 8, 2019
246752f
Merge pull request #110 from lex/deploy-to-pypi
Jan 8, 2019
c978bd4
Version bump to 2.69.0
Jan 8, 2019
ee8c388
Merge pull request #111 from srautiai/devel
Jan 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
language: python
python:
- "2.7"
- "3.4"
- "3.5"
- "3.6"
- "pypy3.5"
- '2.7'
- '3.4'
- '3.5'
- '3.6'
- 'pypy3.5'
install:
- python setup.py clean
- python setup.py sdist
script:
- python setup.py test
deploy:
provider: pypi
user: info-bitbar
password:
secure: KIrmFjMsrEPMutbCQ1peWaOuTxzLVBY7Yy6+KpzkB8UC7hiR9Vqyx6Rfm0DX3N7C1r0wMP1zwo5/HqoV83vpD5x1b0PDFyey72Wj6qLOvcJKYnxJLtOS+KBX1WmDTOwZzvegsN2K3U+u0054lJ1VhIrgkJUwucpYZav6mAs0h7rTG73B36ZlNhfeHEYfBQ4H8NwZin4zDnq6auJOw4tHsPPoqHv7XSyVGRJXsMPXV4Xosu4yNEUdfyKQ/iJPE68DFRqiI8IIKjvxybu+VCupT9DOUCIYnGhjNcMdUV1HajZm9sp3zopCAlfqhsT+aKZSLs0NV8g0alXkw5FYfZTVOyjwM+vjyX/WSLtJEZvAPB8kTQGRCDMVwvbQGVnybRqRvBAbWxDqYOK0LYJENHAPa0ZaoA5yJYV3iwVkvq+V/qWN5+IMtNCWhDoucBBu4FOvEyVB85SZzSopXyhIA7MToX9tLoawuMH/UVoSoWYKay8PTTq3ARPprnQ5Lxw0IAqYmS5eefbmPW5Ie0KlPmtyAmHmfrdDaAJWa1FxE9SrSqtTZwYzy+cAKivXgHa6i8RJouDilt5HGSI/rpCFiDk8YvtR9VR47uDW4JXt6syvOEHpBwykQ1s9eu33swCnqUmK9wO2sTpQ4odQW1lwFZWlHfbMcjVaslQv3sIzgafbrfs=
on:
tags: true
2 changes: 2 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
2.69.0
* Added support for access groups
2.61.0
* Fix error with double slash for some API calls
* Added new test methods
Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import sys, os


version = '2.61.0'
version = '2.69.0'

setup(name='testdroid',
version=version,
Expand All @@ -14,7 +14,7 @@
'Topic :: Software Development',
'Intended Audience :: Developers'], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
keywords='testdroid rest api client',
author='Henri Kivelä <henri.kivela@bitbar.com>, Sakari Rautiainen <sakari.rautiainen@bitbar.com>, Teppo Malinen <teppo.malinen@bitbar.com>, Jarno Tuovinen <jarno.tuovinen@bitbar.com>',
author='Henri Kivelä <henri.kivela@bitbar.com>, Sakari Rautiainen <sakari.rautiainen@bitbar.com>, Teppo Malinen <teppo.malinen@bitbar.com>, Jarno Tuovinen <jarno.tuovinen@bitbar.com>, Atte Keltanen <atte.keltanen@bitbar.com>',
author_email='info@bitbar.com',
url='http://www.testdroid.com',
license='Apache License v2.0',
Expand Down
2 changes: 1 addition & 1 deletion testdroid/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from optparse import OptionParser
from datetime import datetime

__version__ = '2.61.0'
__version__ = '2.69.0'

FORMAT = "%(message)s"
logging.basicConfig(format=FORMAT)
Expand Down