Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .ci/ansible/settings.py.j2
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SECRET_KEY = "{{ django_secret }}"
CONTENT_ORIGIN = "{{ pulp_scheme }}://pulp:{{ 443 if pulp_scheme == 'https' else 80 }}"
ANSIBLE_API_HOSTNAME = "{{ pulp_scheme }}://pulp:{{ 443 if pulp_scheme == 'https' else 80 }}"
ANSIBLE_CONTENT_HOSTNAME = "{{ pulp_scheme }}://pulp:{{ 443 if pulp_scheme == 'https' else 80 }}/pulp/content"
Expand Down
2 changes: 2 additions & 0 deletions .ci/ansible/start_container.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
ansible.builtin.template:
src: "settings.py.j2"
dest: "settings/settings.py"
vars:
django_secret: "lookup('community.general.random_string', length=50, overwrite_all='abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)')"

- name: "Setup docker networking"
community.docker.docker_network:
Expand Down
2 changes: 1 addition & 1 deletion pulp_file/tests/functional/api/test_domains.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import pytest

from pulpcore.app import settings
from pulpcore.app import settings # noqa: TID251 Unfixable in old dynaconf version.
from pulpcore.client.pulp_file import ApiException
from pulpcore.client.pulpcore import ApiException as CoreApiException
from pulpcore.client.pulpcore import Repair
Expand Down
2 changes: 1 addition & 1 deletion pulp_file/tests/functional/api/test_pulp_export.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import pytest

from pulpcore.app import settings
from pulpcore.app import settings # noqa: TID251 Unfixable in old dynaconf version.
from pulpcore.client.pulpcore.exceptions import ApiException
from pulpcore.constants import TASK_STATES

Expand Down
2 changes: 1 addition & 1 deletion pulpcore/app/authentication.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from rest_framework.authentication import BaseAuthentication, RemoteUserAuthentication
from rest_framework.exceptions import AuthenticationFailed

from pulpcore.app import settings
from pulpcore.app import settings # noqa: TID251 Unfixable in old dynaconf version.

_logger = logging.getLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion pulpcore/app/redis_connection.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from redis import Redis
from redis.asyncio import Redis as aRedis

from pulpcore.app.settings import settings
from pulpcore.app.settings import settings # noqa: TID251 Unfixable in old dynaconf version.

_conn = None
_a_conn = None
Expand Down
2 changes: 1 addition & 1 deletion pulpcore/app/serializers/exporter.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from rest_framework import serializers
from rest_framework.validators import UniqueValidator

from pulpcore.app import models, settings
from pulpcore.app import models, settings # noqa: TID251 Unfixable in old dynaconf version.
from pulpcore.app.serializers import (
DetailIdentityField,
DetailRelatedField,
Expand Down
2 changes: 1 addition & 1 deletion pulpcore/app/serializers/importer.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from rest_framework import serializers
from rest_framework.validators import UniqueValidator

from pulpcore.app import models, settings
from pulpcore.app import models, settings # noqa: TID251 Unfixable in old dynaconf version.
from pulpcore.app.serializers import (
DetailIdentityField,
ImportIdentityField,
Expand Down
2 changes: 1 addition & 1 deletion pulpcore/app/serializers/repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from rest_framework import fields, serializers
from rest_framework_nested.serializers import NestedHyperlinkedModelSerializer

from pulpcore.app import models, settings
from pulpcore.app import models, settings # noqa: TID251 Unfixable in old dynaconf version.
from pulpcore.app.serializers import (
DetailIdentityField,
DetailRelatedField,
Expand Down
2 changes: 1 addition & 1 deletion pulpcore/app/views/importer.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from rest_framework.response import Response
from rest_framework.views import APIView

from pulpcore.app import settings
from pulpcore.app import settings # noqa: TID251 Unfixable in old dynaconf version.
from pulpcore.app.serializers import PulpImportCheckResponseSerializer, PulpImportCheckSerializer


Expand Down
2 changes: 1 addition & 1 deletion pulpcore/cache/cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
get_async_redis_connection,
get_redis_connection,
)
from pulpcore.app.settings import settings
from pulpcore.app.settings import settings # noqa: TID251 Unfixable in old dynaconf version.
from pulpcore.responses import ArtifactResponse

DEFAULT_EXPIRES_TTL = settings.CACHE_SETTINGS["EXPIRES_TTL"]
Expand Down
2 changes: 1 addition & 1 deletion pulpcore/tests/functional/api/test_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import pytest

from pulpcore.app import settings
from pulpcore.app import settings # noqa: TID251 Unfixable in old dynaconf version.
from pulpcore.client.pulpcore import ApiException


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import pytest

from pulpcore.app import settings
from pulpcore.app import settings # noqa: TID251 Unfixable in old dynaconf version.
from pulpcore.client.pulp_file import RepositorySyncURL
from pulpcore.client.pulpcore.exceptions import ApiException

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

import pytest

from pulpcore.app import settings
from pulpcore.app import settings # noqa: TID251 Unfixable in old dynaconf version.
from pulpcore.client.pulp_file import RepositorySyncURL
from pulpcore.client.pulpcore.exceptions import ApiException

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ replace = "version = \"{new_version}\""
[[tool.bumpversion.files]]
filename = "./setup.py"


[tool.ruff]
# This section is managed by the plugin template. Do not edit manually.
line-length = 100
Expand All @@ -184,6 +183,7 @@ extend-select = [
[tool.ruff.lint.flake8-tidy-imports.banned-api]
# This section is managed by the plugin template. Do not edit manually.
"distutils".msg = "The 'distutils' module has been deprecated since Python 3.9."
"pulpcore.app.settings".msg = "Always import 'settings' from 'django.conf' instead."

[tool.ruff.lint.isort]
# This section is managed by the plugin template. Do not edit manually.
Expand Down