Merge fa929f4 into 04e8433

django-cms · Jan 27, 2022 · f6f0c19 · f6f0c19
2 parents 04e8433 + fa929f4
commit f6f0c19
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 1 deletion.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,35 @@
+repos:
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v2.31.0
+    hooks:
+      - id: pyupgrade
+        args: ["--py37-plus"]
+
+  - repo: https://github.com/adamchainz/django-upgrade
+    rev: '1.4.0'
+    hooks:
+      - id: django-upgrade
+        args: [--target-version, "2.2"]
+
+  - repo: https://github.com/PyCQA/flake8
+    rev: 4.0.1
+    hooks:
+      - id: flake8
+
+  - repo: https://github.com/asottile/yesqa
+    rev: v1.3.0
+    hooks:
+      - id: yesqa
+
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.1.0
+    hooks:
+      - id: check-merge-conflict
+      - id: debug-statements
+      - id: mixed-line-ending
+      - id: trailing-whitespace
+
+  - repo: https://github.com/pycqa/isort
+    rev: 5.10.1
+    hooks:
+      - id: isort
diff --git a/docs/how_to/contributing.rst b/docs/how_to/contributing.rst
@@ -46,6 +46,10 @@ The basic workflow for a code contribution will typically run as follows:
 
    Replace ``X.Y`` with whichever version of Django you want to work with.
 
+#. Install pre-commit hooks::
+
+    pre-commit install
+
 #. Create a new branch for your work::
 
     git checkout -b my_fix

diff --git a/test_requirements/django-3.2.txt b/test_requirements/django-3.2.txt
@@ -1,4 +1,7 @@
 -r requirements_base.txt
 Django==3.2
+djangocms-admin-style>=3.0
+django-classy-tags>=3.0
 django-formtools==2.2
+django-sekizai>=3.0
 pyenchant==3.0.1
diff --git a/test_requirements/requirements_base.txt b/test_requirements/requirements_base.txt
@@ -8,11 +8,13 @@ dj-database-url
 djangocms-admin-style>=1.5
 django-sekizai>=0.7
 django-classy-tags>=0.7.2
-https://github.com/divio/djangocms-text-ckeditor/archive/master.zip
+https://github.com/django-cms/djangocms-text-ckeditor/archive/master.zip
 https://github.com/ojii/django-better-test/archive/8aa2407d097fe3789b74682f0e6bd7d15d449416.zip#egg=django-better-test
 https://github.com/ojii/django-app-manage/archive/65da18ef234a4e985710c2c0ec760023695b40fe.zip#egg=django-app-manage
 iptools
 # required to run the server for integration tests
 django-app-helper
 mock>=2.0.0
 flake8
+isort
+pre-commit