Skip to content

Commit

Permalink
Unpin Marshmallow requirement (#254)
Browse files Browse the repository at this point in the history
  • Loading branch information
patricksanders committed Jul 13, 2020
1 parent 34a2735 commit 7852827
Show file tree
Hide file tree
Showing 6 changed files with 89 additions and 73 deletions.
2 changes: 1 addition & 1 deletion repokid/__init__.py
Expand Up @@ -20,7 +20,7 @@

import import_string

__version__ = "0.12.1"
__version__ = "0.13.0"


def init_config():
Expand Down
2 changes: 1 addition & 1 deletion repokid/cli/dispatcher_cli.py
Expand Up @@ -42,7 +42,7 @@ class MessageSchema(Schema):
selection = fields.Str()

@post_load
def make_message(self, data):
def make_message(self, data, **kwargs):
return Message(**data)


Expand Down
8 changes: 5 additions & 3 deletions repokid/tests/test_dispatcher_cli.py
@@ -1,7 +1,9 @@
import copy
import datetime

from marshmallow import ValidationError
from mock import call, patch
import pytest
import repokid.cli.dispatcher_cli as dispatcher_cli
import repokid.dispatcher as dispatcher

Expand Down Expand Up @@ -43,7 +45,7 @@ def test_schema(self):
"respond_user": "user",
}
result = schema.load(test_message)
assert not result.errors
assert result.command == "list_repoable_services"

# missing required field command
test_message = {
Expand All @@ -52,8 +54,8 @@ def test_schema(self):
"respond_channel": "channel",
"respond_user": "user",
}
result = schema.load(test_message)
assert result.errors
with pytest.raises(ValidationError):
_ = schema.load(test_message)

@patch("repokid.utils.dynamo.find_role_in_cache")
@patch("repokid.utils.dynamo.get_role_data")
Expand Down
79 changes: 41 additions & 38 deletions requirements-test.txt
Expand Up @@ -2,45 +2,48 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --output-file requirements-test.txt requirements-test.in
# pip-compile --no-index --output-file=requirements-test.txt requirements-test.in
#

appdirs==1.4.3 # via black
atomicwrites==1.3.0 # via pytest
attrs==19.1.0 # via black, packaging, pytest
bandit==1.6.2
black==19.3b0
certifi==2019.6.16 # via requests
appdirs==1.4.4 # via black
attrs==19.3.0 # via black, pytest
bandit==1.6.2 # via -r requirements-test.in
black==19.10b0 # via -r requirements-test.in
certifi==2020.6.20 # via requests
chardet==3.0.4 # via requests
click==7.0 # via black
coverage==4.5.4 # via coveralls
coveralls==1.8.2
click==7.1.2 # via black
coverage==5.2 # via coveralls
coveralls==2.1.1 # via -r requirements-test.in
docopt==0.6.2 # via coveralls
entrypoints==0.3 # via flake8
flake8-import-order==0.18.1
flake8==3.7.8
gitdb2==2.0.5 # via gitpython
gitpython==3.0.2 # via bandit
idna==2.8 # via requests
importlib-metadata==0.20 # via pluggy, pytest
flake8-import-order==0.18.1 # via -r requirements-test.in
flake8==3.8.3 # via -r requirements-test.in
gitdb==4.0.5 # via gitpython
gitpython==3.1.7 # via bandit
idna==2.10 # via requests
importlib-metadata==1.7.0 # via flake8, pluggy, pytest, stevedore
mccabe==0.6.1 # via flake8
mock==3.0.5
more-itertools==7.2.0 # via pytest, zipp
packaging==19.1 # via pytest
pbr==5.4.2 # via stevedore
pluggy==0.12.0 # via pytest
py==1.8.0 # via pytest
pycodestyle==2.5.0 # via flake8, flake8-import-order
pyflakes==2.1.1 # via flake8
pyparsing==2.4.2 # via packaging
pytest==5.1.2
python-dateutil==2.8.0
pyyaml==5.1.2 # via bandit
requests==2.22.0 # via coveralls
six==1.12.0 # via bandit, mock, packaging, python-dateutil, stevedore
smmap2==2.0.5 # via gitdb2
stevedore==1.30.1 # via bandit
toml==0.10.0 # via black
urllib3==1.25.3 # via requests
wcwidth==0.1.7 # via pytest
zipp==0.6.0 # via importlib-metadata
mock==4.0.2 # via -r requirements-test.in
more-itertools==8.4.0 # via pytest
packaging==20.4 # via pytest
pathspec==0.8.0 # via black
pbr==5.4.5 # via stevedore
pluggy==0.13.1 # via pytest
py==1.9.0 # via pytest
pycodestyle==2.6.0 # via flake8, flake8-import-order
pyflakes==2.2.0 # via flake8
pyparsing==2.4.7 # via packaging
pytest==5.4.3 # via -r requirements-test.in
python-dateutil==2.8.1 # via -r requirements-test.in
pyyaml==5.3.1 # via bandit
regex==2020.6.8 # via black
requests==2.24.0 # via coveralls
six==1.15.0 # via bandit, packaging, python-dateutil
smmap==3.0.4 # via gitdb
stevedore==3.1.0 # via bandit
toml==0.10.1 # via black
typed-ast==1.4.1 # via black
urllib3==1.25.9 # via requests
wcwidth==0.2.5 # via pytest
zipp==3.1.0 # via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# setuptools
2 changes: 1 addition & 1 deletion requirements.in
Expand Up @@ -2,7 +2,7 @@ boto3
cloudaux
docopt
import_string
marshmallow<3
marshmallow
policyuniverse
requests
tabulate
Expand Down
69 changes: 40 additions & 29 deletions requirements.txt
Expand Up @@ -2,41 +2,52 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile requirements.in
# pip-compile --no-index --output-file=requirements.txt requirements.in
#
bleach==3.1.1 # via readme-renderer
boto3==1.9.216
bleach==3.1.5 # via readme-renderer
boto3==1.14.20 # via -r requirements.in, cloudaux
boto==2.49.0 # via cloudaux
botocore==1.12.216 # via boto3, cloudaux, s3transfer
certifi==2019.6.16 # via requests
botocore==1.17.20 # via boto3, cloudaux, s3transfer
certifi==2020.6.20 # via requests
chardet==3.0.4 # via requests
click==7.0 # via pip-tools
cloudaux==1.6.4
click==7.1.2 # via pip-tools
cloudaux==1.8.1 # via -r requirements.in
colorama==0.4.3 # via twine
defusedxml==0.6.0 # via cloudaux
docopt==0.6.2
docopt==0.6.2 # via -r requirements.in
docutils==0.15.2 # via botocore, readme-renderer
flagpole==1.1.1 # via cloudaux
idna==2.8 # via requests
import-string==0.1.0
inflection==0.3.1 # via cloudaux
jmespath==0.9.4 # via boto3, botocore
joblib==0.13.2 # via cloudaux
marshmallow==2.20.2
pip-tools==4.3.0
idna==2.10 # via requests
import-string==0.1.0 # via -r requirements.in
importlib-metadata==1.7.0 # via keyring, twine
inflection==0.5.0 # via cloudaux
jmespath==0.10.0 # via boto3, botocore
joblib==0.16.0 # via cloudaux
keyring==21.2.1 # via twine
marshmallow==3.7.0 # via -r requirements.in
packaging==20.4 # via bleach
pip-tools==5.2.1 # via -r requirements.in
pkginfo==1.5.0.1 # via twine
policyuniverse==1.3.2.0
pygments==2.4.2 # via readme-renderer
python-dateutil==2.8.0 # via botocore
pytz==2019.2
raven==6.10.0
readme-renderer==24.0 # via twine
policyuniverse==1.3.2.3 # via -r requirements.in
pygments==2.6.1 # via readme-renderer
pyparsing==2.4.7 # via packaging
python-dateutil==2.8.1 # via botocore
pytz==2020.1 # via -r requirements.in
raven==6.10.0 # via -r requirements.in
readme-renderer==26.0 # via twine
requests-toolbelt==0.9.1 # via twine
requests==2.22.0
s3transfer==0.2.1 # via boto3
six==1.12.0 # via bleach, cloudaux, import-string, pip-tools, python-dateutil, readme-renderer
tabulate==0.8.3
tabview==1.4.3
tqdm==4.35.0
twine==1.13.0
urllib3==1.25.3 # via botocore, requests
requests==2.24.0 # via -r requirements.in, requests-toolbelt, twine
rfc3986==1.4.0 # via twine
s3transfer==0.3.3 # via boto3
six==1.15.0 # via bleach, cloudaux, import-string, packaging, pip-tools, python-dateutil, readme-renderer
tabulate==0.8.7 # via -r requirements.in
tabview==1.4.4 # via -r requirements.in
tqdm==4.47.0 # via -r requirements.in, twine
twine==3.2.0 # via -r requirements.in
urllib3==1.25.9 # via botocore, requests
webencodings==0.5.1 # via bleach
zipp==3.1.0 # via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
# setuptools

0 comments on commit 7852827

Please sign in to comment.