Skip to content

Commit

Permalink
fixing broken build
Browse files Browse the repository at this point in the history
  • Loading branch information
thingsplode committed Sep 14, 2018
1 parent 05625fe commit e600378
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ services:
- redis-server

install:
- pip install -U pip setuptools pytest pytest-flask flake8 requests-mock codecov pytest-cov
- pip install -U pip setuptools pytest pytest-flask flake8 requests-mock codecov pytest-cov money
# trying to include unreleased fixes for pylint in combination w. Python 3.7
- pip install --pre -U pylint astroid
- pip install --editable .
- cd tests && pybabel compile -d ./translations && cd ..

script:
- python setup.py test
#- python setup.py test
- coverage run -m pytest ./tests
#- pytest tests/ -v --capture=no
- pylint --rcfile=./pylintrc appkernel
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ A super-easy microservice and API framework, which enables API development from
Let's build an awseome mini identity service:
```python
class User(Model, MongoRepository):
# define the resource schema as class meta data
id = Property(str)
name = Property(str, index=UniqueIndex)
email = Property(str, validators=[Email], index=UniqueIndex)
Expand All @@ -34,6 +35,7 @@ class User(Model, MongoRepository):
@classmethod
def before_post(cls, *args, **kwargs):
# this method is automatically called before persisting the instance
# one can use after_post for hook after the persistence.
user = kwargs.get('model')
print(f'going to create the following user: {user}')

Expand Down
2 changes: 1 addition & 1 deletion appkernel/generators.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,6 @@ def hash_content(password):
if password.startswith('$pbkdf2-sha256'):
return password
else:
return pbkdf2_sha256.encrypt(password, rounds=rounds, salt_size=salt_size)
return pbkdf2_sha256.hash(password, rounds=rounds, salt_size=salt_size)

return hash_content

0 comments on commit e600378

Please sign in to comment.