From 1e44d518263cec365fbbc545cb5a4cf747abffb5 Mon Sep 17 00:00:00 2001 From: Jason White Date: Fri, 7 Apr 2017 11:30:42 -0400 Subject: [PATCH 1/4] fix install_requires in setup.py --- setup.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index bf9511a..5ea614b 100755 --- a/setup.py +++ b/setup.py @@ -39,14 +39,14 @@ def get_version(): ], test_suite='tests', install_requires=[ - 'GitPython==2.1.1', - 'pylint==1.6.5', - 'six>=1.10.0', - 'typing>=3.5.3.0', + 'GitPython>=2.1.1,<3', + 'pylint>=1.6.5,<2', + 'six>=1.10.0,<2', + 'typing>=3.5.3.0,<4', + 'autopep8>=1.2.2,<2', ], extras_require={ 'dev': [ - 'autopep8', 'mock; python_version < "3.3"', 'mypy; python_version >= "3.3"', 'pycodestyle == 2.2.0', From fcad93e8ce745b965019d6578ca99edf799f683b Mon Sep 17 00:00:00 2001 From: Jason White Date: Fri, 7 Apr 2017 11:44:21 -0400 Subject: [PATCH 2/4] pin dev versions --- setup.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 5ea614b..ce7f687 100755 --- a/setup.py +++ b/setup.py @@ -47,11 +47,11 @@ def get_version(): ], extras_require={ 'dev': [ - 'mock; python_version < "3.3"', - 'mypy; python_version >= "3.3"', - 'pycodestyle == 2.2.0', - 'pytest', - 'pytest-randomly', + 'mock==2.0.0; python_version < "3.3"', + 'mypy==0.501; python_version >= "3.3"', + 'pycodestyle==2.2.0', + 'pytest==3.0.6', + 'pytest-randomly==1.1.2', ] } ) From 2df90be2117a2d84f1d8da4456b75c7736150581 Mon Sep 17 00:00:00 2001 From: Jason White Date: Fri, 7 Apr 2017 11:53:07 -0400 Subject: [PATCH 3/4] also fix autopep8 to use setup.cfg --- Makefile | 2 +- shopify_python/git_utils.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a963f3b..ce84673 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ clean: autopep8: @echo 'Auto Formatting...' - @$(python_files) | xargs -0 autopep8 --jobs 0 --in-place --aggressive + @$(python_files) | xargs -0 autopep8 --jobs 0 --in-place --aggressive --global-config setup.cfg lint: @echo 'Linting...' diff --git a/shopify_python/git_utils.py b/shopify_python/git_utils.py index a269bda..0f8ebe0 100644 --- a/shopify_python/git_utils.py +++ b/shopify_python/git_utils.py @@ -105,6 +105,7 @@ def autopep_files(files, max_line_length): class _CustomPylintReporter(text.ColorizedTextReporter): + def __init__(self): # type: () -> None super(_CustomPylintReporter, self).__init__() From 1cfc9c7ecc6fb632b3b0015aa6711d4d6302d35e Mon Sep 17 00:00:00 2001 From: Jason White Date: Fri, 7 Apr 2017 12:00:01 -0400 Subject: [PATCH 4/4] bump pycodestyle to 2.3.1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ce7f687..26766b7 100755 --- a/setup.py +++ b/setup.py @@ -49,7 +49,7 @@ def get_version(): 'dev': [ 'mock==2.0.0; python_version < "3.3"', 'mypy==0.501; python_version >= "3.3"', - 'pycodestyle==2.2.0', + 'pycodestyle==2.3.1', 'pytest==3.0.6', 'pytest-randomly==1.1.2', ]