Skip to content

Commit d88ef56

Browse files
silentfatezsilentfatez
committed
black rerrun on files
1 parent 938369b commit d88ef56

File tree

2 files changed

+95
-70
lines changed

2 files changed

+95
-70
lines changed

‎readthedocs/builds/models.py

Lines changed: 59 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""Models for the builds app."""
2+
23
import datetime
34
import os.path
45
import re
@@ -16,41 +17,66 @@
1617
from polymorphic.models import PolymorphicModel
1718

1819
import readthedocs.builds.automation_actions as actions
19-
from readthedocs.builds.constants import (BRANCH, BUILD_FINAL_STATES,
20-
BUILD_STATE, BUILD_STATE_FINISHED,
21-
BUILD_STATE_TRIGGERED,
22-
BUILD_STATUS_CHOICES, BUILD_TYPES,
23-
EXTERNAL, EXTERNAL_VERSION_STATES,
24-
INTERNAL, LATEST,
25-
PREDEFINED_MATCH_ARGS,
26-
PREDEFINED_MATCH_ARGS_VALUES, STABLE,
27-
VERSION_TYPES)
28-
from readthedocs.builds.managers import (AutomationRuleMatchManager,
29-
ExternalBuildManager,
30-
ExternalVersionManager,
31-
InternalBuildManager,
32-
InternalVersionManager,
33-
VersionManager)
34-
from readthedocs.builds.querysets import (BuildQuerySet, RelatedBuildQuerySet,
35-
VersionQuerySet)
20+
from readthedocs.builds.constants import (
21+
BRANCH,
22+
BUILD_FINAL_STATES,
23+
BUILD_STATE,
24+
BUILD_STATE_FINISHED,
25+
BUILD_STATE_TRIGGERED,
26+
BUILD_STATUS_CHOICES,
27+
BUILD_TYPES,
28+
EXTERNAL,
29+
EXTERNAL_VERSION_STATES,
30+
INTERNAL,
31+
LATEST,
32+
PREDEFINED_MATCH_ARGS,
33+
PREDEFINED_MATCH_ARGS_VALUES,
34+
STABLE,
35+
VERSION_TYPES,
36+
)
37+
from readthedocs.builds.managers import (
38+
AutomationRuleMatchManager,
39+
ExternalBuildManager,
40+
ExternalVersionManager,
41+
InternalBuildManager,
42+
InternalVersionManager,
43+
VersionManager,
44+
)
45+
from readthedocs.builds.querysets import (
46+
BuildQuerySet,
47+
RelatedBuildQuerySet,
48+
VersionQuerySet,
49+
)
3650
from readthedocs.builds.signals import version_changed
37-
from readthedocs.builds.utils import (external_version_name,
38-
get_bitbucket_username_repo,
39-
get_github_username_repo,
40-
get_gitlab_username_repo, get_vcs_url)
41-
from readthedocs.builds.version_slug import (generate_unique_version_slug,
42-
version_slug_validator)
43-
from readthedocs.core.utils import (extract_valid_attributes_for_model,
44-
trigger_build)
51+
from readthedocs.builds.utils import (
52+
external_version_name,
53+
get_bitbucket_username_repo,
54+
get_github_username_repo,
55+
get_gitlab_username_repo,
56+
get_vcs_url,
57+
)
58+
from readthedocs.builds.version_slug import (
59+
generate_unique_version_slug,
60+
version_slug_validator,
61+
)
62+
from readthedocs.core.utils import extract_valid_attributes_for_model, trigger_build
4563
from readthedocs.notifications.models import Notification
46-
from readthedocs.projects.constants import (BITBUCKET_COMMIT_URL,
47-
DOCTYPE_CHOICES, GITHUB_COMMIT_URL,
48-
GITHUB_PULL_REQUEST_COMMIT_URL,
49-
GITLAB_COMMIT_URL,
50-
GITLAB_MERGE_REQUEST_COMMIT_URL,
51-
MEDIA_TYPES, MKDOCS, MKDOCS_HTML,
52-
PRIVACY_CHOICES, PRIVATE, SPHINX,
53-
SPHINX_HTMLDIR, SPHINX_SINGLEHTML)
64+
from readthedocs.projects.constants import (
65+
BITBUCKET_COMMIT_URL,
66+
DOCTYPE_CHOICES,
67+
GITHUB_COMMIT_URL,
68+
GITHUB_PULL_REQUEST_COMMIT_URL,
69+
GITLAB_COMMIT_URL,
70+
GITLAB_MERGE_REQUEST_COMMIT_URL,
71+
MEDIA_TYPES,
72+
MKDOCS,
73+
MKDOCS_HTML,
74+
PRIVACY_CHOICES,
75+
PRIVATE,
76+
SPHINX,
77+
SPHINX_HTMLDIR,
78+
SPHINX_SINGLEHTML,
79+
)
5480
from readthedocs.projects.models import APIProject, Project
5581
from readthedocs.projects.ordering import ProjectItemPositionManager
5682
from readthedocs.projects.validators import validate_build_config_file
@@ -60,7 +86,6 @@
6086

6187

6288
class Version(TimeStampedModel):
63-
6489
"""Version of a ``Project``."""
6590

6691
project = models.ForeignKey(
@@ -548,7 +573,6 @@ def get_storage_paths(self, version_slug=None):
548573

549574

550575
class APIVersion(Version):
551-
552576
"""
553577
Version proxy model for API data deserialization.
554578
@@ -600,7 +624,6 @@ def save(self, *args, **kwargs):
600624

601625

602626
class Build(models.Model):
603-
604627
"""Build data."""
605628

606629
project = models.ForeignKey(
@@ -996,7 +1019,6 @@ def reset(self):
9961019

9971020

9981021
class BuildCommandResultMixin:
999-
10001022
"""
10011023
Mixin for common command result methods/properties.
10021024
@@ -1020,7 +1042,6 @@ def failed(self):
10201042

10211043

10221044
class BuildCommandResult(BuildCommandResultMixin, models.Model):
1023-
10241045
"""Build command for a ``Build``."""
10251046

10261047
build = models.ForeignKey(
@@ -1053,7 +1074,6 @@ def run_time(self):
10531074

10541075

10551076
class VersionAutomationRule(PolymorphicModel, TimeStampedModel):
1056-
10571077
"""Versions automation rules for projects."""
10581078

10591079
ACTIVATE_VERSION_ACTION = "activate-version"

‎readthedocs/projects/models.py

Lines changed: 36 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""Project models."""
2+
23
import fnmatch
34
import hashlib
45
import hmac
@@ -17,14 +18,19 @@
1718
from django.utils.crypto import get_random_string
1819
from django.utils.functional import cached_property
1920
from django.utils.translation import gettext_lazy as _
20-
from django_extensions.db.fields import (CreationDateTimeField,
21-
ModificationDateTimeField)
21+
from django_extensions.db.fields import CreationDateTimeField, ModificationDateTimeField
2222
from django_extensions.db.models import TimeStampedModel
2323
from taggit.managers import TaggableManager
2424

25-
from readthedocs.builds.constants import (BRANCH, EXTERNAL, INTERNAL, LATEST,
26-
LATEST_VERBOSE_NAME, STABLE,
27-
STABLE_VERBOSE_NAME)
25+
from readthedocs.builds.constants import (
26+
BRANCH,
27+
EXTERNAL,
28+
INTERNAL,
29+
LATEST,
30+
LATEST_VERBOSE_NAME,
31+
STABLE,
32+
STABLE_VERBOSE_NAME,
33+
)
2834
from readthedocs.core.history import ExtraHistoricalRecords
2935
from readthedocs.core.resolver import Resolver
3036
from readthedocs.core.utils import extract_valid_attributes_for_model, slugify
@@ -36,25 +42,36 @@
3642
from readthedocs.projects import constants
3743
from readthedocs.projects.exceptions import ProjectConfigurationError
3844
from readthedocs.projects.managers import HTMLFileManager
39-
from readthedocs.projects.querysets import (ChildRelatedProjectQuerySet,
40-
FeatureQuerySet, ProjectQuerySet,
41-
RelatedProjectQuerySet)
45+
from readthedocs.projects.querysets import (
46+
ChildRelatedProjectQuerySet,
47+
FeatureQuerySet,
48+
ProjectQuerySet,
49+
RelatedProjectQuerySet,
50+
)
4251
from readthedocs.projects.validators import (
43-
validate_build_config_file, validate_custom_prefix,
44-
validate_custom_subproject_prefix, validate_domain_name,
45-
validate_environment_variable_size, validate_no_ip,
46-
validate_repository_url)
52+
validate_build_config_file,
53+
validate_custom_prefix,
54+
validate_custom_subproject_prefix,
55+
validate_domain_name,
56+
validate_environment_variable_size,
57+
validate_no_ip,
58+
validate_repository_url,
59+
)
4760
from readthedocs.projects.version_handling import determine_stable_version
4861
from readthedocs.search.parsers import GenericParser
4962
from readthedocs.storage import build_media_storage
5063
from readthedocs.vcs_support.backends import backend_cls
5164

52-
from .constants import (ADDONS_FLYOUT_POSITION_CHOICES,
53-
ADDONS_FLYOUT_SORTING_CHOICES,
54-
ADDONS_FLYOUT_SORTING_SEMVER_READTHEDOCS_COMPATIBLE,
55-
DOWNLOADABLE_MEDIA_TYPES, MEDIA_TYPES,
56-
MULTIPLE_VERSIONS_WITH_TRANSLATIONS,
57-
MULTIPLE_VERSIONS_WITHOUT_TRANSLATIONS, PUBLIC)
65+
from .constants import (
66+
ADDONS_FLYOUT_POSITION_CHOICES,
67+
ADDONS_FLYOUT_SORTING_CHOICES,
68+
ADDONS_FLYOUT_SORTING_SEMVER_READTHEDOCS_COMPATIBLE,
69+
DOWNLOADABLE_MEDIA_TYPES,
70+
MEDIA_TYPES,
71+
MULTIPLE_VERSIONS_WITH_TRANSLATIONS,
72+
MULTIPLE_VERSIONS_WITHOUT_TRANSLATIONS,
73+
PUBLIC,
74+
)
5875

5976
log = structlog.get_logger(__name__)
6077

@@ -65,7 +82,6 @@ def default_privacy_level():
6582

6683

6784
class ProjectRelationship(models.Model):
68-
6985
"""
7086
Project to project relationship.
7187
@@ -120,7 +136,6 @@ def subproject_prefix(self):
120136

121137

122138
class AddonsConfig(TimeStampedModel):
123-
124139
"""
125140
Addons project configuration.
126141
@@ -251,7 +266,6 @@ class AddonsConfig(TimeStampedModel):
251266

252267

253268
class AddonSearchFilter(TimeStampedModel):
254-
255269
"""
256270
Addon search user defined filter.
257271
@@ -264,7 +278,6 @@ class AddonSearchFilter(TimeStampedModel):
264278

265279

266280
class Project(models.Model):
267-
268281
"""Project model."""
269282

270283
# Auto fields
@@ -1367,8 +1380,7 @@ def show_advertising(self):
13671380
return False
13681381

13691382
if "readthedocsext.spamfighting" in settings.INSTALLED_APPS:
1370-
from readthedocsext.spamfighting.utils import \
1371-
is_show_ads_denied # noqa
1383+
from readthedocsext.spamfighting.utils import is_show_ads_denied # noqa
13721384

13731385
return not is_show_ads_denied(self)
13741386

@@ -1433,7 +1445,6 @@ def organization(self):
14331445

14341446

14351447
class APIProject(Project):
1436-
14371448
"""
14381449
Project proxy model for API data deserialization.
14391450
@@ -1507,7 +1518,6 @@ def environment_variables(self, *, public_only=True):
15071518

15081519

15091520
class ImportedFile(models.Model):
1510-
15111521
"""
15121522
Imported files model.
15131523
@@ -1559,7 +1569,6 @@ def get_absolute_url(self):
15591569

15601570

15611571
class HTMLFile(ImportedFile):
1562-
15631572
"""
15641573
Imported HTML file Proxy model.
15651574
@@ -1581,7 +1590,6 @@ def processed_json(self):
15811590

15821591

15831592
class Notification(TimeStampedModel):
1584-
15851593
"""WebHook / Email notification attached to a Project."""
15861594

15871595
# TODO: Overridden from TimeStampedModel just to allow null values,
@@ -1746,7 +1754,6 @@ def sign_payload(self, payload):
17461754

17471755

17481756
class Domain(TimeStampedModel):
1749-
17501757
"""A custom domain name for a project."""
17511758

17521759
# TODO: Overridden from TimeStampedModel just to allow null values,
@@ -1870,7 +1877,6 @@ def save(self, *args, **kwargs):
18701877

18711878

18721879
class HTTPHeader(TimeStampedModel, models.Model):
1873-
18741880
"""
18751881
Define a HTTP header for a user Domain.
18761882
@@ -1913,7 +1919,6 @@ def __str__(self):
19131919

19141920

19151921
class Feature(models.Model):
1916-
19171922
"""
19181923
Project feature flags.
19191924

0 commit comments

Comments
 (0)