reduce file length

okfn · Apr 23, 2024 · d721e87 · d721e87
1 parent 7266fbc
commit d721e87
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 56 deletions.
diff --git a/.github/workflows/test-ckan-2.10.yml b/.github/workflows/test-ckan-2.10.yml
@@ -36,11 +36,6 @@ jobs:
         pip install flake8
         flake8 . --count --statistics
 
-    - name: Black
-      run: |
-        pip install --ignore-installed black
-        black . --check --diff
-
     - name: Install requirements
       # Install any extra requirements your extension has here (dev requirements, other extensions etc)
       run: |

diff --git a/.github/workflows/test-ckan-2.9.yml b/.github/workflows/test-ckan-2.9.yml
@@ -36,11 +36,6 @@ jobs:
         pip install flake8
         flake8 . --count --statistics
 
-    - name: Black
-      run: |
-        pip install black
-        black . --check --diff
-
     - name: Install requirements
       # Install any extra requirements your extension has here (dev requirements, other extensions etc)
       run: |

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,12 +1,7 @@
 repos:
--   repo: https://github.com/psf/black
-    rev: 22.6.0
-    hooks:
-    - id: black
-      args: [ckanext, --check, --diff]
-      language_version: python3.8
 -   repo: https://gitlab.com/pycqa/flake8
     rev: 3.7.9
     hooks:
     - id: flake8
       files: ckanext
+      args: [--max-line-length=130]
diff --git a/README.md b/README.md
@@ -68,8 +68,7 @@ do:
 
 ### Activate pre-commits
 
-There are github actions to check code with `flake8` and `black` so
-it will be usefull to activate pre-commits
+There are github actions to check code with `flake8` so it will be usefull to activate pre-commits
 
 ```
 pip install pre-commit

diff --git a/ckanext/announcements/blueprints.py b/ckanext/announcements/blueprints.py
@@ -113,38 +113,7 @@ def delete():
     return toolkit.redirect_to("announcements.index")
 
 
-announcements_blueprint.add_url_rule(
-    rule="/",
-    view_func=index,
-    methods=[
-        "GET",
-    ],
-    strict_slashes=False,
-)
-
-announcements_blueprint.add_url_rule(
-    rule="/new",
-    view_func=create,
-    methods=[
-        "POST",
-    ],
-    strict_slashes=False,
-)
-
-announcements_blueprint.add_url_rule(
-    rule="/update",
-    view_func=update,
-    methods=[
-        "POST",
-    ],
-    strict_slashes=False,
-)
-
-announcements_blueprint.add_url_rule(
-    rule="/delete",
-    view_func=delete,
-    methods=[
-        "POST",
-    ],
-    strict_slashes=False,
-)
+announcements_blueprint.add_url_rule(rule="/", view_func=index, methods=["GET"], strict_slashes=False)
+announcements_blueprint.add_url_rule(rule="/new", view_func=create, methods=["POST"], strict_slashes=False)
+announcements_blueprint.add_url_rule(rule="/update", view_func=update, methods=["POST"], strict_slashes=False)
+announcements_blueprint.add_url_rule(rule="/delete", view_func=delete, methods=["POST"], strict_slashes=False)
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/test.ini b/test.ini
@@ -4,7 +4,7 @@ smtp_server = localhost
 error_email_from = ckan@localhost
 
 [app:main]
-use = config:/srv/app/src/ckan/test-core.ini
+use = config:../../ckan/test-core.ini
 
 # Insert any custom config settings to be used when running your extension's
 # tests here. These will override the one defined in CKAN core's test-core.ini