aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCody Hiar <codyfh@gmail.com>2018-12-17 22:19:03 +0000
committerCody Hiar <codyfh@gmail.com>2018-12-17 22:19:03 +0000
commit0d48964a2ff35d2ce8af9f4f78d6a656ff49af17 (patch)
tree35cebea450e7a20745cd544f4db9ff7d94641f3f
parent3c3a82f38a4de58b8fe2ce0d6d2d606c8a156df5 (diff)
Updating python setup
-rw-r--r--Dockerfile10
-rw-r--r--flake811
-rw-r--r--isort.cfg7
-rw-r--r--py2_requirements.txt8
-rw-r--r--py3_requirements.txt12
5 files changed, 37 insertions, 11 deletions
diff --git a/Dockerfile b/Dockerfile
index 8ba13c0..c6b6011 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -61,11 +61,11 @@ RUN wget https://releases.hashicorp.com/terraform/0.11.8/terraform_0.11.8_linux_
########################################
# Install python linting and neovim plugin
-RUN pip install neovim jedi flake8 flake8-docstrings flake8-isort flake8-quotes
-RUN pip install pep8-naming pep257 isort
-RUN pip3 install neovim jedi flake8 flake8-docstrings flake8-isort flake8-quotes
-RUN pip3 install pep8-naming pep257 isort mypy ansible-lint flake8-bugbear
-RUN pip3 install flake8-commas flake8-comprehensions
+ADD py2_requirements.txt /opt/py2_requirements.txt
+RUN cd /opt && pip2 install -r py2_requirements.txt
+
+ADD py3_requirements.txt /opt/py3_requirements.txt
+RUN cd /opt && pip3 install -r py3_requirements.txt
########################################
diff --git a/flake8 b/flake8
index 464614b..fb6d15f 100644
--- a/flake8
+++ b/flake8
@@ -1,6 +1,9 @@
[flake8]
exclude =
- migrations,
- __init__.py,
- settings,
-max-line-length = 99
+ migrations,
+ __init__.py,
+ settings,
+ venv
+max-line-length = 88
+max-complexity = 18
+ignore = E126, E501, W503
diff --git a/isort.cfg b/isort.cfg
index 761b71a..beffcca 100644
--- a/isort.cfg
+++ b/isort.cfg
@@ -1,12 +1,15 @@
[settings]
not_skip=__init__.py
indent=' '
-multi_line_output=5
+line_length=88
+include_trailing_comma=True
+use_parentheses=True
+multi_line_output=3
+force_grid_wrap=0
known_django=django
sections=FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
default_section=FIRSTPARTY
skip=migrations
-include_trailing_comma=True
# Because neovim runs in separate container, explicitly calling out third parties is needed
known_third_party=pdfcrowd,PyPDF2,pytest,mock,model_mommy,adminactions,private_storage,wagtail,modelcluster,django_extensions,localflavor,post_office,paypal,djangocms_link,peewee,ccxt,openpyxl,logzero,blessings,expiringdict,opbeat,gspread,oauth2client,mailchimp3,ratelimit,pytz,scrapy,rules
known_first_party=cms
diff --git a/py2_requirements.txt b/py2_requirements.txt
new file mode 100644
index 0000000..9eba4b8
--- /dev/null
+++ b/py2_requirements.txt
@@ -0,0 +1,8 @@
+neovim
+jedi
+flake8
+flake8-docstrings
+flake8-isort
+pep8-naming
+pep257
+isort
diff --git a/py3_requirements.txt b/py3_requirements.txt
new file mode 100644
index 0000000..eb77616
--- /dev/null
+++ b/py3_requirements.txt
@@ -0,0 +1,12 @@
+ansible-lint==3.5.1
+black==18.9b
+flake8==3.5.0
+flake8-bugbear==18.8.0
+flake8-docstrings==1.3.0
+flake8-isort==2.5.0
+isort==4.3.4
+jedi==0.13.2
+mypy==0.650
+neovim==0.2.6
+pep8-naming==0.7.0
+pep257==0.7.0