Skip to content

Commit c13a564

Browse files
authored
Merge pull request #718 from furlongm/isort
add isort check
2 parents 15e5ba1 + a59a23b commit c13a564

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+292
-212
lines changed

.github/workflows/lint-and-test.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ jobs:
2828
pip install flake8
2929
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
3030
flake8 . --count --max-line-length=120 --show-source --statistics
31+
- name: Check isort
32+
run: |
33+
pip install isort
34+
isort --check --profile=django .
3135
- name: Set secret key
3236
run: ./sbin/patchman-set-secret-key
3337
- name: Test with django

arch/admin.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
# along with Patchman. If not, see <http://www.gnu.org/licenses/>
1717

1818
from django.contrib import admin
19-
from arch.models import PackageArchitecture, MachineArchitecture
19+
20+
from arch.models import MachineArchitecture, PackageArchitecture
2021

2122
admin.site.register(PackageArchitecture)
2223
admin.site.register(MachineArchitecture)

arch/serializers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
from rest_framework import serializers
1818

19-
from arch.models import PackageArchitecture, MachineArchitecture
19+
from arch.models import MachineArchitecture, PackageArchitecture
2020

2121

2222
class PackageArchitectureSerializer(serializers.HyperlinkedModelSerializer):

arch/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# You should have received a copy of the GNU General Public License
1515
# along with Patchman. If not, see <http://www.gnu.org/licenses/>
1616

17-
from arch.models import PackageArchitecture, MachineArchitecture
17+
from arch.models import MachineArchitecture, PackageArchitecture
1818
from util.logging import info_message
1919

2020

arch/views.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616

1717
from rest_framework import viewsets
1818

19-
from arch.models import PackageArchitecture, MachineArchitecture
20-
from arch.serializers import PackageArchitectureSerializer, \
21-
MachineArchitectureSerializer
19+
from arch.models import MachineArchitecture, PackageArchitecture
20+
from arch.serializers import (
21+
MachineArchitectureSerializer, PackageArchitectureSerializer,
22+
)
2223

2324

2425
class PackageArchitectureViewSet(viewsets.ModelViewSet):

domains/admin.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
# along with Patchman. If not, see <http://www.gnu.org/licenses/>
1717

1818
from django.contrib import admin
19+
1920
from domains.models import Domain
2021

2122
admin.site.register(Domain)

errata/admin.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
# along with Patchman. If not, see <http://www.gnu.org/licenses/>
1616

1717
from django.contrib import admin
18+
1819
from errata.models import Erratum
1920

2021

errata/models.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,16 @@
1616

1717
import json
1818

19-
from django.db import models
19+
from django.db import IntegrityError, models
2020
from django.urls import reverse
21-
from django.db import IntegrityError
2221

22+
from errata.managers import ErratumManager
2323
from packages.models import Package, PackageUpdate
2424
from packages.utils import find_evr, get_matching_packages
25-
from errata.managers import ErratumManager
2625
from security.models import CVE, Reference
2726
from security.utils import get_or_create_cve, get_or_create_reference
28-
from util.logging import error_message
2927
from util import get_url
28+
from util.logging import error_message
3029

3130

3231
class Erratum(models.Model):

errata/sources/distros/alma.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
from operatingsystems.utils import get_or_create_osrelease
2323
from packages.models import Package
2424
from packages.utils import get_or_create_package, parse_package_string
25-
from util import get_url, fetch_content, get_setting_of_type
2625
from patchman.signals import pbar_start, pbar_update
26+
from util import fetch_content, get_setting_of_type, get_url
2727

2828

2929
def update_alma_errata(concurrent_processing=True):

errata/sources/distros/arch.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@
2020
from django.db import connections
2121

2222
from operatingsystems.utils import get_or_create_osrelease
23-
from util.logging import error_message
24-
from patchman.signals import pbar_start, pbar_update
2523
from packages.models import Package
26-
from packages.utils import find_evr, get_matching_packages, get_or_create_package
27-
from util import get_url, fetch_content
24+
from packages.utils import (
25+
find_evr, get_matching_packages, get_or_create_package,
26+
)
27+
from patchman.signals import pbar_start, pbar_update
28+
from util import fetch_content, get_url
29+
from util.logging import error_message
2830

2931

3032
def update_arch_errata(concurrent_processing=False):

0 commit comments

Comments
 (0)