Fix missing package in Travis build

bounce/db/user.py

@@ -40,12 +40,7 @@ def select(session, username):
     Returns the user with the given username or None if
     there is no such user.
     """
-<<<<<<< HEAD
     return session.query(User).filter(User.username == username).first()
-=======
-    user = session.query(User).filter(User.username == username).first()
-    return None if user is None else user
->>>>>>> Add user authentication
 
 
 def insert(session, full_name, username, secret, email):

bounce/server/api/auth.py

@@ -5,23 +5,15 @@
 from . import APIError, Endpoint, util
 from ...db import user
 from ..resource import validate
-<<<<<<< HEAD
 from ..resource.auth import AuthenticateUserRequest, AuthenticateUserResponse
-=======
-from ..resource.auth import AuthenticateUserRequeset, AuthenticateUserResponse
->>>>>>> Add user authentication
 
 
 class LoginEndpoint(Endpoint):
     """Handles requests to /auth/login."""
 
     __uri__ = '/auth/login'
 
-<<<<<<< HEAD
     @validate(AuthenticateUserRequest, AuthenticateUserResponse)
-=======
-    @validate(AuthenticateUserRequeset, AuthenticateUserResponse)
->>>>>>> Add user authentication
     async def post(self, request):
         """Handles a POST /auth/login request by validating the user's
         credentials and issuing them a JSON Web Token."""

bounce/server/api/users.py

@@ -34,11 +34,7 @@ async def put(self, request, username, id_from_token=None):
         # Make sure the ID from the token is for the user we're updating
         user_row = user.select(self.server.db_session, username)
         if not user_row:
-<<<<<<< HEAD
             raise APIError('No such user', status=404)
-=======
-            raise APIError('No such user', status=400)
->>>>>>> Add user authentication
         if user_row.identifier != id_from_token:
             raise APIError('Forbidden', status=403)
         # Update the user
@@ -57,11 +53,7 @@ async def delete(self, _, username, id_from_token=None):
         # Make sure the ID from the token is for the user we're deleting
         user_row = user.select(self.server.db_session, username)
         if not user_row:
-<<<<<<< HEAD
             raise APIError('No such user', status=404)
-=======
-            raise APIError('No such user', status=400)
->>>>>>> Add user authentication
         elif user_row.identifier != id_from_token:
             raise APIError('Forbidden', status=403)
         # Delete the user

bounce/server/api/util.py

@@ -5,7 +5,7 @@
 from datetime import datetime, timedelta
 
 import bcrypt
-from jose import jwt, exceptions
+from jose import exceptions, jwt
 
 # Regexes for validating passwords and usernames
 # pylint: disable=anomalous-backslash-in-string

test-requirements.in

@@ -3,5 +3,6 @@ flake8==3.5.0
 yapf==0.22.0
 isort==4.3.4
 pytest-asyncio==0.8.0
-aiohttp==3.3.0
+aiohttp==3.3.2
+idna-ssl==1.1.0
 coveralls==1.3.0

test-requirements.txt

@@ -4,7 +4,7 @@
 #
 #    pip-compile --output-file test-requirements.txt test-requirements.in
 #
-aiohttp==3.3.0
+aiohttp==3.3.2
 astroid==1.6.5            # via pylint
 async-timeout==3.0.0      # via aiohttp
 atomicwrites==1.1.5       # via pytest
@@ -15,7 +15,7 @@ coverage==4.5.1           # via coveralls
 coveralls==1.3.0
 docopt==0.6.2             # via coveralls
 flake8==3.5.0
-idna-ssl==1.1.0           # via aiohttp
+idna-ssl==1.1.0
 idna==2.7                 # via idna-ssl, requests, yarl
 isort==4.3.4
 lazy-object-proxy==1.3.1  # via astroid