setup pre-commit hook

.gitlab-ci.yml

@@ -19,6 +19,18 @@ stages:
   - build
   - deploy
 
+test:format:
+  stage: test
+  image: python:3.8
+  script:
+  - black --check .
+  tags:
+  - lint
+  except:
+  - tags
+  - rc
+  - demo
+
 test:lint:3.6:
   stage: test
   image: python:3.6
@@ -45,7 +57,7 @@ test:lint:3.7:
 
 test:lint:3.8:
   stage: test
-  image: python:3.8-rc
+  image: python:3.8
   script:
   - pip install tox
   - tox -e pep8
@@ -88,10 +100,9 @@ test:py:3.7:
     reports:
       junit: .reports/burpui.junit.xml
 
-# This test is temporarily disabled because werkzeug doesn't run yet on 3.8
 test:py:3.8:
   stage: test
-  image: python:3.8-rc
+  image: python:3.8
   script:
   - pip install tox
   - mkdir .reports

burpui/translations/es/LC_MESSAGES/messages.po

@@ -2782,4 +2782,3 @@ msgstr ""
 #~ " <em>moderator</em> o con <em> demo "
 #~ "</em> / <em> demo </em>.   \n"
 #~ "                "
-

burpui/translations/fr/LC_MESSAGES/messages.po

@@ -2428,4 +2428,3 @@ msgstr "Mise à jour"
 
 #~ msgid "Backends list"
 #~ msgstr "Liste des Backends"
-

burpui/translations/it/LC_MESSAGES/messages.po

@@ -2709,4 +2709,3 @@ msgstr ""
 #~ " / <em>moderator</em> sia come "
 #~ "<em>demo</em> / <em>demo</em>.\n"
 #~ "                "
-

docker/demo/docker-burp1/assets/config/burp/CA.cnf

@@ -31,4 +31,3 @@ basicConstraints        = CA:FALSE
 
 [ policy_anything ]
 commonName              = supplied
-

docker/demo/docker-burp1/assets/config/burp/burp.conf

@@ -105,4 +105,3 @@ exclude_comp=bz2
 exclude_comp=gz
 
 #encryption_password = My^$pAsswIrD%@
-

docker/demo/docker-burp2/assets/config/burp/CA.cnf

@@ -31,4 +31,3 @@ basicConstraints        = CA:FALSE
 
 [ policy_anything ]
 commonName              = supplied
-

docker/demo/docker-burp2/assets/config/burp/burp.conf

@@ -122,4 +122,3 @@ exclude_comp=gz
 # When enabled, this causes problems in the phase1 scan (such as an 'include'
 # being missing) to be treated as fatal errors. The default is 0.
 #scan_problem_raises_error=1
-

docker/demo/docker-burpui/assets/config/nginx/workers_header.conf

@@ -1,3 +1,2 @@
 upstream socketio_nodes {
     ip_hash;
-

docker/docker-alpine/assets/config/burp/burp-server.conf

@@ -172,4 +172,3 @@ restore_client = agent
 # Whether or not the server process should cache the tree when a monitor client
 # is browsing a backup. Advantage: speed. Disadvantage: more memory is used.
 monitor_browse_cache = 1
-

docker/docker-alpine/assets/config/burp/burp.conf

@@ -122,4 +122,3 @@ exclude_comp=gz
 # When enabled, this causes problems in the phase1 scan (such as an 'include'
 # being missing) to be treated as fatal errors. The default is 0.
 #scan_problem_raises_error=1
-

docker/docker-alpine/assets/config/nginx/workers_header.conf

@@ -1,3 +1,2 @@
 upstream socketio_nodes {
     ip_hash;
-

pyproject.toml

@@ -0,0 +1,8 @@
+[tool.pylint.messages_control]
+disable = "C0330, C0326"
+
+[tool.pylint.format]
+max-line-length = "88"
+
+[tool.black]
+extend-exclude = "(docker/docker-alpine/assets/config/burp-ui/burpui_gunicorn.py|pkgs/burp-ui-tpl/setup.py)"

requirements.txt

@@ -1,17 +1,17 @@
-trio==0.13.0
-Flask==1.1.1
-Flask-Login==0.4.1
+trio==0.18.0
+Flask==1.1.2
+Flask-Login==0.5.0
 Flask-Bower==1.3.0
-Flask-Babel==1.0.0
+Flask-Babel==2.0.0
 Flask-WTF==0.14.3
-flask-restx==0.2.0
-Flask-Caching==1.8.0
-Flask-Session==0.3.1
-WTForms==2.2.1
+flask-restx==0.3.0
+Flask-Caching==1.10.1
+Flask-Session==0.3.2
+WTForms==2.3.3
 arrow==0.14.2
 pluginbase==1.0.0
-tzlocal==2.0.0
-pyOpenSSL==19.1.0
+tzlocal==2.1
+pyOpenSSL==20.0.1
 configobj==5.0.6
-async_generator
-Click==7.1.1
+async_generator==1.10
+Click==7.1.2

setup.py

@@ -262,7 +262,7 @@ url = __url__
 with open(os.path.join(ROOT, "requirements.txt")) as f:
     requires = [x.strip() for x in f if x.strip()]
 
-dev_requires = ["flake8", "pylint"]
+dev_requires = ["flake8", "pylint", "black"]
 test_requires = [
     "pytest",
     "pytest-cov",

tox.ini

@@ -12,6 +12,7 @@ commands = flake8
 
 [flake8]
 exclude = .tox,docs,migrations,.git,docker,pkgs
-ignore = E501,E722,W605,W504
+extend-ignore = E203
+max-line-length = 88
 show-source = true
 application-import-names = burpui