Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates to #3850 to fix merge conflict #4198

Merged
merged 4 commits into from
Jun 7, 2018
Merged

Updates to #3850 to fix merge conflict #4198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
84b6ed8
move validators
mashrikt Mar 25, 2018
2277d2e
Merge branch 'move-validators' of https://github.com/mashrikt/readthe…
ericholscher Jun 6, 2018
db49f0d
Merge remote-tracking branch 'origin/master' into mashrikt-move-valid…
ericholscher Jun 7, 2018
50217cc
Update to new spot
ericholscher Jun 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions readthedocs/projects/migrations/0010_migrate_domain_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from django.db import models, migrations
from future.backports.urllib.parse import urlparse

import readthedocs.core.validators
import readthedocs.projects.validators


def migrate_url(apps, schema_editor):
Expand Down Expand Up @@ -46,7 +46,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='domain',
name='domain',
field=models.CharField(unique=True, max_length=255, verbose_name='Domain', validators=[readthedocs.core.validators.DomainNameValidator()]),
field=models.CharField(unique=True, max_length=255, verbose_name='Domain', validators=[readthedocs.projects.validators.DomainNameValidator()]),

),
]
4 changes: 2 additions & 2 deletions readthedocs/projects/migrations/0024_add-show-version-warning.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from __future__ import unicode_literals

from django.db import migrations, models
import readthedocs.core.validators
import readthedocs.projects.validators


class Migration(migrations.Migration):
Expand Down Expand Up @@ -76,7 +76,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='project',
name='repo',
field=models.CharField(help_text='Hosted documentation repository URL', max_length=255, validators=[readthedocs.core.validators.RepositoryURLValidator()], verbose_name='Repository URL'),
field=models.CharField(help_text='Hosted documentation repository URL', max_length=255, validators=[readthedocs.projects.validators.RepositoryURLValidator()], verbose_name='Repository URL'),
),
migrations.AlterField(
model_name='project',
Expand Down
2 changes: 1 addition & 1 deletion readthedocs/projects/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
from readthedocs.builds.constants import LATEST, LATEST_VERBOSE_NAME, STABLE
from readthedocs.core.resolver import resolve, resolve_domain
from readthedocs.core.utils import broadcast, slugify
from readthedocs.core.validators import validate_domain_name, validate_repository_url
from readthedocs.projects import constants
from readthedocs.projects.exceptions import ProjectConfigurationError
from readthedocs.projects.querysets import (
ChildRelatedProjectQuerySet, FeatureQuerySet, ProjectQuerySet,
RelatedProjectQuerySet)
from readthedocs.projects.templatetags.projects_tags import sort_version_aware
from readthedocs.projects.validators import validate_domain_name, validate_repository_url
from readthedocs.projects.version_handling import (
determine_stable_version, version_windows)
from readthedocs.restapi.client import api
Expand Down
2 changes: 1 addition & 1 deletion readthedocs/core/validators.py → readthedocs/projects/validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""Validators for core app."""
"""Validators for projects app."""

# From https://github.com/django/django/pull/3477/files
from __future__ import absolute_import
Expand Down
2 changes: 1 addition & 1 deletion readthedocs/vcs_support/backends/git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
from git.exc import BadName
from six import PY2, StringIO

from readthedocs.core.validators import validate_submodule_url
from readthedocs.projects.exceptions import RepositoryError
from readthedocs.projects.validators import validate_submodule_url
from readthedocs.vcs_support.base import BaseVCS, VCSVersion
from builtins import str

Expand Down