Skip to content

Commit

Permalink
Merge pull request #23 from cloudblue/LITE-26346-add-flake8-isort
Browse files Browse the repository at this point in the history
LITE-26346: added flake8-isort
  • Loading branch information
ffaraone authored Feb 3, 2023
2 parents 12c2065 + d5e02a3 commit b923ee0
Show file tree
Hide file tree
Showing 10 changed files with 418 additions and 279 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
timeout-minutes: 10
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10"]
python-version: ["3.8", "3.9", "3.10", "3.11"]
steps:
- uses: actions/checkout@v3
with:
Expand Down
5 changes: 1 addition & 4 deletions executor/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
from importlib import import_module

from connect.reports.parser import parse
from connect.reports.validator import (
validate,
validate_with_schema,
)
from connect.reports.validator import validate, validate_with_schema
from pkg_resources import DistributionNotFound, get_distribution

from executor.exceptions import RunnerException
Expand Down
650 changes: 398 additions & 252 deletions poetry.lock

Large diffs are not rendered by default.

21 changes: 11 additions & 10 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "connect-reports-runner"
version = "24.0.0"
version = "26.0.0"
description = "Connect Reports Runner"
authors = ["CloudBlue LLC"]
license = "Apache-2.0"
Expand All @@ -18,6 +18,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Topic :: Utilities",
"Topic :: Software Development :: Libraries",
]
Expand Down Expand Up @@ -59,6 +60,7 @@ pdbpp = "0.*"
pyfakefs ="4.*"
pytest-randomly = "3.*"
responses = "0.*"
flake8-isort = "^6.0.0"

[build-system]
requires = ["poetry-core>=1.0.0"]
Expand Down Expand Up @@ -111,14 +113,13 @@ ignore = ["FI1", "W503", "E800"]


[tool.isort]
line_length = 100
src_paths = "*"
sections = ["FUTURE", "STDLIB", "THIRDPARTY", "FIRSTPARTY", "LOCALFOLDER"]
group_by_package = true
multi_line_output = 3
force_grid_wrap = 4
combine_as_imports = true
balanced_wrapping = true
lines_after_imports = 2
use_parentheses = true
include_trailing_comma = true
not_skip = "__init__.py"
multi_line_output = 5

import_heading_stdlib = "built-in"
import_heading_thirdparty = "external"
import_heading_firstparty = "project"
line_length = 100
lines_after_imports = 2
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# Copyright (c) 2020, CloudBlue
# Copyright (c) 2023, CloudBlue
# All rights reserved.
#

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# Copyright (c) 2020, CloudBlue
# Copyright (c) 2023, CloudBlue
# All rights reserved.
#

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# Copyright (c) 2020, CloudBlue
# Copyright (c) 2023, CloudBlue
# All rights reserved.
#

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# Copyright (c) 2020, CloudBlue
# Copyright (c) 2023, CloudBlue
# All rights reserved.
#

Expand Down
5 changes: 1 addition & 4 deletions tests/test_executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@
import pytest
from connect.client import ClientError, ConnectClient
from connect.reports.constants import DEFAULT_RENDERER_ID
from connect.reports.datamodels import (
RendererDefinition,
ReportDefinition,
)
from connect.reports.datamodels import RendererDefinition, ReportDefinition

import executor.executor

Expand Down
6 changes: 2 additions & 4 deletions tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@

import pytest
from connect.client import ConnectClient
from pkg_resources import (
DistributionNotFound,
)
from pkg_resources import DistributionNotFound

from executor.exceptions import RunnerException
from executor.utils import (
Expand Down Expand Up @@ -112,8 +110,8 @@ def test_upload_file(mocked_responses, fs):
status=204,
json={},
)
import tempfile
import os
import tempfile
with tempfile.TemporaryDirectory() as tmpdir:
import pathlib
zipfile = os.path.join(tmpdir, 'report.zip')
Expand Down

0 comments on commit b923ee0

Please sign in to comment.