From 90e53b8c3f713c8a66cd9dbdc7c6c134491927f6 Mon Sep 17 00:00:00 2001 From: drew2a Date: Mon, 11 Apr 2022 17:01:51 +0200 Subject: [PATCH 1/2] Code climate --- .codeclimate.yml | 20 +++++++++++++++---- .github/workflows/coverage.yml | 3 +++ .github/workflows/documentation.yml | 2 +- README.rst | 16 ++++++++++++--- .../components/tag/community/tag_community.py | 2 -- .../components/tag/community/tag_payload.py | 1 - .../tag/community/tests/test_tag_community.py | 2 -- .../components/tag/db/tests/test_tag_db.py | 1 - .../components/tag/restapi/tags_endpoint.py | 4 ---- .../tag/restapi/tests/test_tags_endpoint.py | 7 ++----- .../tag/rules/tag_rules_processor.py | 1 - .../tag/tests/test_tag_component.py | 3 +-- tox.ini | 11 ++++++++++ 13 files changed, 47 insertions(+), 26 deletions(-) create mode 100644 tox.ini diff --git a/.codeclimate.yml b/.codeclimate.yml index ecaf72e177f..5546f4a586a 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -1,7 +1,19 @@ +#https://docs.codeclimate.com/docs/advanced-configuration#section-configuration-file-structure-and-content + +version: "2" + plugins: +# pep8 uses `tox.ini` as a config file pep8: enabled: true - bandit: - enabled: true - sonar-python: - enabled: true +# bandit: +# enabled: true +# sonar-python: +# enabled: true + +# markdownlint uses `.mdlrc` as a config file +# markdownlint: +# enabled: true +# shellcheck: +# enabled: true + diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 656ec0e2825..af2ea9480cc 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -1,6 +1,9 @@ name: Coverage on: + push: + branches: + - main pull_request: jobs: diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 13067da751f..3f1795c3647 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -1,4 +1,4 @@ -name: Documentation (no publish) +name: Documentation on: pull_request: diff --git a/README.rst b/README.rst index 5a6000b6c25..12baab1c182 100644 --- a/README.rst +++ b/README.rst @@ -1,8 +1,7 @@ ******* Tribler ******* - -|jenkins_build| |docs| |contributors| |pr_closed| |issues_closed| +|Pytest| |docs| |Maintainability| |Coverage| |contributors| |pr_closed| |issues_closed| |python_3_8| |python_3_9| @@ -201,4 +200,15 @@ We like to hear your feedback and suggestions. To reach out to us, you can join :target: https://www.python.org/ .. |python_3_9| image:: https://img.shields.io/badge/python-3.9-blue.svg - :target: https://www.python.org/ \ No newline at end of file + :target: https://www.python.org/ + +.. |Pytest| image:: https://github.com/Tribler/tribler/actions/workflows/pytest.yml/badge.svg?branch=main + :target: https://github.com/Tribler + +.. |Maintainability| image:: https://api.codeclimate.com/v1/badges/a2f61aa9829ac493f6d3/maintainability + :target: https://codeclimate.com/github/Tribler/tribler/maintainability + +.. |Coverage| image:: https://api.codeclimate.com/v1/badges/a2f61aa9829ac493f6d3/test_coverage + :target: https://codeclimate.com/github/Tribler/tribler/test_coverage + :alt: Test Coverage + diff --git a/src/tribler/core/components/tag/community/tag_community.py b/src/tribler/core/components/tag/community/tag_community.py index 3537777eb27..4ddcc649138 100644 --- a/src/tribler/core/components/tag/community/tag_community.py +++ b/src/tribler/core/components/tag/community/tag_community.py @@ -2,11 +2,9 @@ from binascii import unhexlify from cryptography.exceptions import InvalidSignature - from ipv8.keyvault.private.libnaclkey import LibNaCLSK from ipv8.lazy_community import lazy_wrapper from ipv8.types import Key - from pony.orm import db_session from tribler.core.components.ipv8.tribler_community import TriblerCommunity diff --git a/src/tribler/core/components/tag/community/tag_payload.py b/src/tribler/core/components/tag/community/tag_payload.py index e8165989c0f..c9ed6613b26 100644 --- a/src/tribler/core/components/tag/community/tag_payload.py +++ b/src/tribler/core/components/tag/community/tag_payload.py @@ -3,7 +3,6 @@ from ipv8.messaging.payload_dataclass import overwrite_dataclass, type_from_format - dataclass = overwrite_dataclass(dataclass) diff --git a/src/tribler/core/components/tag/community/tests/test_tag_community.py b/src/tribler/core/components/tag/community/tests/test_tag_community.py index 0141dddd180..aff60893491 100644 --- a/src/tribler/core/components/tag/community/tests/test_tag_community.py +++ b/src/tribler/core/components/tag/community/tests/test_tag_community.py @@ -2,11 +2,9 @@ from unittest.mock import MagicMock, Mock from cryptography.exceptions import InvalidSignature - from ipv8.keyvault.private.libnaclkey import LibNaCLSK from ipv8.test.base import TestBase from ipv8.test.mocking.ipv8 import MockIPv8 - from pony.orm import db_session from tribler.core.components.tag.community.tag_community import TagCommunity diff --git a/src/tribler/core/components/tag/db/tests/test_tag_db.py b/src/tribler/core/components/tag/db/tests/test_tag_db.py index 1664fd87aac..6878cc0a626 100644 --- a/src/tribler/core/components/tag/db/tests/test_tag_db.py +++ b/src/tribler/core/components/tag/db/tests/test_tag_db.py @@ -5,7 +5,6 @@ from unittest.mock import Mock, patch from ipv8.test.base import TestBase - from pony import orm from pony.orm import commit, db_session diff --git a/src/tribler/core/components/tag/restapi/tags_endpoint.py b/src/tribler/core/components/tag/restapi/tags_endpoint.py index 2415cd11d07..b56772901f9 100644 --- a/src/tribler/core/components/tag/restapi/tags_endpoint.py +++ b/src/tribler/core/components/tag/restapi/tags_endpoint.py @@ -3,13 +3,9 @@ from typing import Optional, Set, Tuple from aiohttp import web - from aiohttp_apispec import docs - from ipv8.REST.schema import schema - from marshmallow.fields import Boolean, List, String - from pony.orm import db_session from tribler.core.components.restapi.rest.rest_endpoint import HTTP_BAD_REQUEST, RESTEndpoint, RESTResponse diff --git a/src/tribler/core/components/tag/restapi/tests/test_tags_endpoint.py b/src/tribler/core/components/tag/restapi/tests/test_tags_endpoint.py index 86ef1c44855..a702b4cef2b 100644 --- a/src/tribler/core/components/tag/restapi/tests/test_tags_endpoint.py +++ b/src/tribler/core/components/tag/restapi/tests/test_tags_endpoint.py @@ -1,21 +1,18 @@ from unittest.mock import Mock +import pytest from aiohttp.web_app import Application - from freezegun import freeze_time - from ipv8.keyvault.crypto import default_eccrypto - from pony.orm import db_session -import pytest - from tribler.core.components.restapi.rest.base_api_test import do_request from tribler.core.components.tag.community.tag_payload import TagOperation, TagOperationEnum from tribler.core.components.tag.restapi.tags_endpoint import TagsEndpoint from tribler.core.conftest import TEST_PERSONAL_KEY from tribler.core.utilities.unicode import hexlify + # pylint: disable=redefined-outer-name @pytest.fixture diff --git a/src/tribler/core/components/tag/rules/tag_rules_processor.py b/src/tribler/core/components/tag/rules/tag_rules_processor.py index 4ee64616654..e95553ecd78 100644 --- a/src/tribler/core/components/tag/rules/tag_rules_processor.py +++ b/src/tribler/core/components/tag/rules/tag_rules_processor.py @@ -2,7 +2,6 @@ from typing import Optional, Set from ipv8.taskmanager import TaskManager - from pony.orm import db_session from tribler.core import notifications diff --git a/src/tribler/core/components/tag/tests/test_tag_component.py b/src/tribler/core/components/tag/tests/test_tag_component.py index d9c847b3617..5f080cfb641 100644 --- a/src/tribler/core/components/tag/tests/test_tag_component.py +++ b/src/tribler/core/components/tag/tests/test_tag_component.py @@ -7,8 +7,6 @@ from tribler.core.components.tag.tag_component import TagComponent # pylint: disable=protected-access - - @pytest.mark.asyncio async def test_tag_component(tribler_config): components = [MetadataStoreComponent(), KeyComponent(), Ipv8Component(), TagComponent()] @@ -16,3 +14,4 @@ async def test_tag_component(tribler_config): comp = TagComponent.instance() assert comp.started_event.is_set() and not comp.failed assert comp.community + print(f'test') diff --git a/tox.ini b/tox.ini new file mode 100644 index 00000000000..9430013d563 --- /dev/null +++ b/tox.ini @@ -0,0 +1,11 @@ +;https://docs.codeclimate.com/docs/pep8 +;The PEP8 project has been renamed to pycodestyle. +;The Code Climate PEP8 engine has not been updated to incorporate that name change. +; +;To make configuration specifications in your setup.cfg file or tox.ini file, +;the Code Climate PEP8 engine requires that you include those changes in: +; * a [pep8] config section +; * instead of [pycodestyle] config section. +[pycodestyle] +;https://pep8.readthedocs.io/en/latest/intro.html#configuration +max-line-length = 120 From 79b4c093b55068aaf053d432590be2b4150d46f0 Mon Sep 17 00:00:00 2001 From: drew2a Date: Mon, 11 Apr 2022 17:07:01 +0200 Subject: [PATCH 2/2] pep --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 9430013d563..75e895b9a46 100644 --- a/tox.ini +++ b/tox.ini @@ -6,6 +6,6 @@ ;the Code Climate PEP8 engine requires that you include those changes in: ; * a [pep8] config section ; * instead of [pycodestyle] config section. -[pycodestyle] +[pep8] ;https://pep8.readthedocs.io/en/latest/intro.html#configuration max-line-length = 120