From a2d62700c8dd1f40bf35bb987c96cd90e6f6c76b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Larra=C3=ADn?= Date: Fri, 3 May 2019 21:02:24 -0400 Subject: [PATCH 1/5] requirements: add reasonable version upper-bounds --- setup.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 3603986d..c66e470f 100755 --- a/setup.py +++ b/setup.py @@ -21,12 +21,11 @@ def get_version(*file_paths: Sequence[str]) -> str: readme = open('README.rst').read() history = open('HISTORY.rst').read().replace('.. :changelog:', '') -# TODO: add reasonable upper-bound for some of these packages? requirements = [ - 'cryptography>=2.6.1', - 'defusedxml>=0.5.0', - 'lxml>=4.2.6', - 'marshmallow>=2.16.3', + 'cryptography>=2.6.1,<3', + 'defusedxml>=0.5.0,<1', + 'lxml>=4.2.6,<5', + 'marshmallow>=2.16.3,<3', # TODO: remove upper-bound after a new release of 'signxml' drops the requirement 'pyOpenSSL<19' 'pyOpenSSL>=18.0.0,<19', 'pytz>=2018.7', From 71b05e19e54d6c2105c99c213df0a8d36fde422e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Larra=C3=ADn?= Date: Fri, 3 May 2019 20:59:59 -0400 Subject: [PATCH 2/5] requirements: update all (test) --- requirements/test.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/requirements/test.txt b/requirements/test.txt index daefd728..46cecc12 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -3,10 +3,10 @@ # Required packages: codecov==2.0.15 -coverage==4.5.2 -flake8==3.7.6 -mypy==0.670 -tox==3.7.0 +coverage==4.5.3 +flake8==3.7.7 +mypy==0.701 +tox==3.9.0 # Packages dependencies: # - codecov: @@ -34,6 +34,7 @@ pluggy==0.9.0 py==1.8.0 pycodestyle==2.5.0 pyflakes==2.1.1 +requests toml==0.10.0 -typed-ast==1.3.4 +typed-ast==1.3.5 virtualenv==16.5.0 From abddc5d12b353101995d69658be1fdb3c093f024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Larra=C3=ADn?= Date: Fri, 3 May 2019 17:26:44 -0400 Subject: [PATCH 3/5] requirements: update 'marshmallow' Despite the many releases in between, the code changes are minimal. Changelog: - 2.19.2 (2019-03-30) https://github.com/marshmallow-code/marshmallow/blob/2.x-line/CHANGELOG.rst#2192-2019-03-30 - 2.19.1 (2019-03-16) https://github.com/marshmallow-code/marshmallow/blob/2.x-line/CHANGELOG.rst#2191-2019-03-16 - 2.19.0 (2019-03-07) https://github.com/marshmallow-code/marshmallow/blob/2.x-line/CHANGELOG.rst#2190-2019-03-07 - 2.18.1 (2019-02-15) https://github.com/marshmallow-code/marshmallow/blob/2.x-line/CHANGELOG.rst#2181-2019-02-15 - 2.18.0 (2019-01-13) https://github.com/marshmallow-code/marshmallow/blob/2.x-line/CHANGELOG.rst#2180-2019-01-13 - 2.17.0 (2018-12-26) https://github.com/marshmallow-code/marshmallow/blob/2.x-line/CHANGELOG.rst#2170-2018-12-26 Code diff: https://github.com/marshmallow-code/marshmallow/compare/2.16.3...2.19.2 Closes #23 --- cl_sii/libs/mm_utils.py | 3 ++- requirements/base.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cl_sii/libs/mm_utils.py b/cl_sii/libs/mm_utils.py index 4c25ebeb..52d33411 100644 --- a/cl_sii/libs/mm_utils.py +++ b/cl_sii/libs/mm_utils.py @@ -48,8 +48,9 @@ def __init__(self, format: str = None, **kwargs: Any) -> None: """ super().__init__(**kwargs) # Allow this to be None. It may be set later in the ``_serialize`` - # or ``_desrialize`` methods This allows a Schema to dynamically set the + # or ``_deserialize`` methods This allows a Schema to dynamically set the # dateformat, e.g. from a Meta option + # TODO: for 'marshmallow 3', rename 'dateformat' to 'datetimeformat'. self.dateformat = format def _add_to_schema(self, field_name: str, schema: marshmallow.Schema) -> None: diff --git a/requirements/base.txt b/requirements/base.txt index ac889be3..d6656cbe 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -5,7 +5,7 @@ cryptography==2.6.1 defusedxml==0.5.0 lxml==4.2.6 -marshmallow==2.16.3 +marshmallow==2.19.2 pyOpenSSL==18.0.0 pytz==2019.1 signxml==2.6.0 From 49321552577d33c74095e2ea244ac80eebe8123e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Larra=C3=ADn?= Date: Fri, 3 May 2019 21:11:56 -0400 Subject: [PATCH 4/5] requirements: update 'lxml' Changelog: - 4.3.3 (2019-03-26) https://github.com/lxml/lxml/blob/lxml-4.3.3/CHANGES.txt#L5 - 4.3.2 (2019-02-29) https://github.com/lxml/lxml/blob/lxml-4.3.3/CHANGES.txt#L14 - 4.3.1 (2019-02-08) https://github.com/lxml/lxml/blob/lxml-4.3.3/CHANGES.txt#L28 - 4.3.0 (2019-01-04) https://github.com/lxml/lxml/blob/lxml-4.3.3/CHANGES.txt#L43 https://github.com/lxml/lxml/compare/lxml-4.2.6...lxml-4.3.3 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index d6656cbe..2d08b46b 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,7 +4,7 @@ # Required packages: cryptography==2.6.1 defusedxml==0.5.0 -lxml==4.2.6 +lxml==4.3.3 marshmallow==2.19.2 pyOpenSSL==18.0.0 pytz==2019.1 From 5b8ce84a257415d4bef8ca7ade530488c6ab2510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Larra=C3=ADn?= Date: Fri, 3 May 2019 21:51:32 -0400 Subject: [PATCH 5/5] requirements: update 'defusedxml' Mostly new warnings, Python 3.7 and 3.8 compat, and deprecations. Changelog: - 0.6.0 (2019-04-17) https://github.com/tiran/defusedxml/blob/v0.6.0/CHANGES.txt#L4-L29 https://github.com/tiran/defusedxml/compare/v0.5.0...v0.6.0 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 2d08b46b..0ce3b40b 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -3,7 +3,7 @@ # Required packages: cryptography==2.6.1 -defusedxml==0.5.0 +defusedxml==0.6.0 lxml==4.3.3 marshmallow==2.19.2 pyOpenSSL==18.0.0