diff --git a/.travis.yml b/.travis.yml index 3d572150a9969ed0b5ecd5f78fb70245a3c9174b..3c0b60fcba39c69d1e0d164c150b68396f728ac2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: python python: - - 2.7 - 3.5 - 3.6 + - 3.7 before_install: ## courtesy of http://conda.pydata.org/docs/travis.html - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then diff --git a/geomagio/webservice/login.py b/geomagio/webservice/login.py index ad04a0d881bc84dbb7b3fc07d9f4c6b82897ef45..7281a6e2828dfa63acbf2c07dda5c3309ef5b832 100644 --- a/geomagio/webservice/login.py +++ b/geomagio/webservice/login.py @@ -1,4 +1,5 @@ from __future__ import absolute_import, unicode_literals, print_function +from builtins import str import flask import flask_login @@ -60,7 +61,7 @@ class User(db.Model, flask_login.UserMixin): @login_manager.user_loader -def _load_user(user_id): +def _load_user(user_id: str): return User.query.filter_by(openid=user_id).first() diff --git a/package.json b/package.json index 3eb2a7724a92bc2714feeee27cf5de2b3a6ad906..270fc827a4334a924c4d32903af2530a01ebf03e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "geomag-algorithms", - "version": "0.9.0", + "version": "1.0.0", "homepage": "http://geomag.usgs.gov/", "repository": "https://github.com/usgs/geomag-algorithms.git", "description": "Geomagnetism algorithms.", diff --git a/setup.py b/setup.py index 22119cbf8a3406c8b00e950ac6bd4850a124906f..bad5d3ab29ca6768d36a161a488273d5fff32129 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from distutils.core import setup setup( name='geomag-algorithms', - version='0.9.0', + version='1.0.0', description='USGS Geomag IO Library', url='https://github.com/usgs/geomag-algorithms', packages=[