diff options
| author | Arun <engineerarun@gmail.com> | 2023-02-14 21:33:05 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-14 21:33:05 +0530 |
| commit | 7e0293184f0c708388de1935b5f6725886a3303c (patch) | |
| tree | bd3875f4fb3160e17e5cdf655d2923d7dc6c7693 | |
| parent | f00348e722f03ae710a3a9344e7ad83a4b0f2a42 (diff) | |
| parent | b337e1a715c66c5a3ed9db80019502f8bbbddfe6 (diff) | |
Merge pull request #677 from LeXofLeviafan/lint-fix
fixed linter warnings & moved linting to a separate CI job
| -rw-r--r-- | .circleci/config.yml | 25 | ||||
| -rw-r--r-- | bukuserver/views.py | 15 |
2 files changed, 27 insertions, 13 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 731af56..966ff32 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,22 +12,40 @@ test-template: &test-template environment: CI_FORCE_TEST: 1 steps: - - run: + - run: &init command: | apt update && apt install -y --no-install-recommends git pip install --upgrade pip pip install --upgrade setuptools flake8 pylint - checkout - - run: + - run: &deps command: | pip install -e .[tests] pip install -r requirements.txt + - run: + command: + python3 -m pytest ./tests/test_*.py --cov buku -vv --durations=0 -c ./tests/pytest.ini + +lint-template: &lint-template + working_directory: ~/Buku + environment: + CI_FORCE_TEST: 1 + steps: + - run: *init + - checkout + - run: *deps + - run: + command: | python3 -m flake8 echo buku | xargs pylint --rcfile tests/.pylintrc find . -iname "*.py" ! -path "./api/*" | xargs pylint --rcfile tests/.pylintrc - python3 -m pytest ./tests/test_*.py --cov buku -vv --durations=0 -c ./tests/pytest.ini jobs: + lint: + docker: + - image: python:3.7-slim + <<: *lint-template + py37: docker: - image: python:3.7-slim @@ -102,6 +120,7 @@ workflows: test: jobs: &all-tests + - lint - py37 - py38 - py39 diff --git a/bukuserver/views.py b/bukuserver/views.py index d6f38c7..9e35786 100644 --- a/bukuserver/views.py +++ b/bukuserver/views.py @@ -215,8 +215,7 @@ class BookmarkModelView(BaseModelView): ) LOG.exception(msg) return False - else: - self.after_model_change(form, model, True) + self.after_model_change(form, model, True) return model def delete_model(self, model): @@ -232,8 +231,7 @@ class BookmarkModelView(BaseModelView): ) LOG.exception(msg) return False - else: - self.after_model_delete(model) + self.after_model_delete(model) return res def get_list(self, page, sort_field, sort_desc, _, filters, page_size=None): @@ -409,8 +407,7 @@ class BookmarkModelView(BaseModelView): ) LOG.exception(msg) return False - else: - self.after_model_change(form, model, False) + self.after_model_change(form, model, False) return res @@ -560,8 +557,7 @@ class TagModelView(BaseModelView): ) LOG.exception(msg) return False - else: - self.after_model_delete(model) + self.after_model_delete(model) return res def update_model(self, form, model): @@ -581,8 +577,7 @@ class TagModelView(BaseModelView): ) LOG.exception(msg) return False - else: - self.after_model_change(form, model, False) + self.after_model_change(form, model, False) return res def create_model(self, form): |