Skip to content

Commit e600378

Browse files
committed
fixing broken build
1 parent 05625fe commit e600378

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ services:
1414
- redis-server
1515

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

2323
script:
24-
- python setup.py test
24+
#- python setup.py test
2525
- coverage run -m pytest ./tests
2626
#- pytest tests/ -v --capture=no
2727
- pylint --rcfile=./pylintrc appkernel

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ A super-easy microservice and API framework, which enables API development from
2525
Let's build an awseome mini identity service:
2626
```python
2727
class User(Model, MongoRepository):
28+
# define the resource schema as class meta data
2829
id = Property(str)
2930
name = Property(str, index=UniqueIndex)
3031
email = Property(str, validators=[Email], index=UniqueIndex)
@@ -34,6 +35,7 @@ class User(Model, MongoRepository):
3435
@classmethod
3536
def before_post(cls, *args, **kwargs):
3637
# this method is automatically called before persisting the instance
38+
# one can use after_post for hook after the persistence.
3739
user = kwargs.get('model')
3840
print(f'going to create the following user: {user}')
3941

appkernel/generators.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@ def hash_content(password):
6262
if password.startswith('$pbkdf2-sha256'):
6363
return password
6464
else:
65-
return pbkdf2_sha256.encrypt(password, rounds=rounds, salt_size=salt_size)
65+
return pbkdf2_sha256.hash(password, rounds=rounds, salt_size=salt_size)
6666

6767
return hash_content

0 commit comments

Comments
 (0)