diff --git a/.travis.yml b/.travis.yml index e5a0818..bc3d944 100755 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +sudo: false language: python python: - '2.7' @@ -12,7 +13,7 @@ install: script: - coverage run --source=yahoo_oauth -m pytest -v tests.py before_install: -- openssl aes-256-cbc -K $encrypted_6d515aab85d8_key -iv $encrypted_6d515aab85d8_iv +- openssl aes-256-cbc -K $encrypted_177fac13197a_key -iv $encrypted_177fac13197a_iv -in secrets.tar.enc -out secrets.tar -d - tar xvf secrets.tar after_success: diff --git a/dev_requirements.txt b/dev_requirements.txt index b09ba8b..7e93fdd 100755 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -1,25 +1,29 @@ -Jinja2=>2.8 -Markdown=>2.6.2 -MarkupSafe=>0.23 -PyYAML=>3.11 -certifi=>2015.9.6.2 -click=>5.1 -coverage=>4.0 -coveralls=>1.0 -docopt=>0.6.2 -ghp-import=>0.4.1 -livereload=>2.4.0 -mkdocs=>0.14.0 -myql=>1.2.7 -oauthlib=>1.0.3 -pluggy=>0.3.1 -py=>1.4.30 -pytest=>2.8.2 -rauth=>0.7.1 -requests=>2.8.0 -requests-oauthlib=>0.5.0 -six=>1.10.0 -tornado=>4.2.1 -tox=>2.1.1 -virtualenv=>13.1.2 -yahoo-oauth=>0.1.7 +Jinja2>=2.8 +Markdown>=2.6.2 +MarkupSafe>=0.23 +PyYAML>=3.11 +argparse>=1.2.1 +backports.ssl-match-hostname>=3.4.0.2 +certifi>=2015.09.06.2 +click>=5.1 +coverage>=4.0 +coveralls>=1.0 +distribute>=0.6.24 +docopt>=0.6.2 +ghp-import>=0.4.1 +livereload>=2.4.0 +mkdocs>=0.14.0 +myql>=1.2.7 +oauthlib>=1.0.3 +pluggy>=0.3.1 +py>=1.4.30 +pytest>=2.8.2 +rauth>=0.7.1 +requests>=2.8.0 +requests-oauthlib>=0.5.0 +six>=1.10.0 +tornado>=4.2.1 +tox>=2.1.1 +virtualenv>=13.1.2 +wsgiref>=0.1.2 +yahoo-oauth>=0.1.7 diff --git a/secrets.tar.enc b/secrets.tar.enc index 320a8ed..c8e7f96 100755 Binary files a/secrets.tar.enc and b/secrets.tar.enc differ diff --git a/setup.py b/setup.py index a06b634..cc0ff12 100755 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ __author__ = 'Josue Kouka' __email__ = 'josuebrunel@gmail.com' -__version__ = '0.1.8' +__version__ = '0.1.9' #requirements.txt with open('requirements.txt') as f: diff --git a/yahoo_oauth/__init__.py b/yahoo_oauth/__init__.py index 24d207a..812a5b0 100755 --- a/yahoo_oauth/__init__.py +++ b/yahoo_oauth/__init__.py @@ -2,7 +2,7 @@ __author__ = 'Josue Kouka' __email__ = 'josuebrunel@gmail.com' -__version__ = "0.1.8" +__version__ = "0.1.9" from yahoo_oauth.yahoo_oauth import OAuth1, OAuth2 diff --git a/yahoo_oauth/utils.py b/yahoo_oauth/utils.py index bd9b8ca..f6642aa 100644 --- a/yahoo_oauth/utils.py +++ b/yahoo_oauth/utils.py @@ -29,14 +29,14 @@ def get_file_extension(filename): def get_data(filename): """Calls right function according to file extension """ - ext = get_file_extension(filename) + name, ext = get_file_extension(filename) func = json_get_data if ext == '.json' else yaml_get_data return func(filename) def write_data(data, filename): """Call right func to save data according to file extension """ - ext = get_file_extension(filename) + name, ext = get_file_extension(filename) func = json_write_data if ext == '.json' else yaml_write_data return func(data, filename)