diff --git a/.gitea/workflows/ci-cd.yml b/.gitea/workflows/ci-cd.yml index 714b26c..f400739 100644 --- a/.gitea/workflows/ci-cd.yml +++ b/.gitea/workflows/ci-cd.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Checkout code run: | - git clone --depth=1 --branch=${GITHUB_REF_NAME} ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git . + git clone --depth=1 --branch=${GITHUB_REF_NAME} https://oauth2:${{ secrets.GITEA_TOKEN }}@${GITHUB_SERVER_URL#*://}/${GITHUB_REPOSITORY}.git . git checkout ${GITHUB_SHA} - name: Install Python and uv @@ -52,7 +52,7 @@ jobs: steps: - name: Checkout code run: | - git clone --depth=1 --branch=${GITHUB_REF_NAME} ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git . + git clone --depth=1 --branch=${GITHUB_REF_NAME} https://oauth2:${{ secrets.GITEA_TOKEN }}@${GITHUB_SERVER_URL#*://}/${GITHUB_REPOSITORY}.git . git checkout ${GITHUB_SHA} - name: Install Python and uv @@ -86,7 +86,7 @@ jobs: steps: - name: Checkout code run: | - git clone --depth=1 --branch=${GITHUB_REF_NAME} ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git . + git clone --depth=1 --branch=${GITHUB_REF_NAME} https://oauth2:${{ secrets.GITEA_TOKEN }}@${GITHUB_SERVER_URL#*://}/${GITHUB_REPOSITORY}.git . git checkout ${GITHUB_SHA} - name: Build web image @@ -110,7 +110,7 @@ jobs: steps: - name: Checkout code run: | - git clone --depth=1 --branch=${GITHUB_REF_NAME} ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git . + git clone --depth=1 --branch=${GITHUB_REF_NAME} https://oauth2:${{ secrets.GITEA_TOKEN }}@${GITHUB_SERVER_URL#*://}/${GITHUB_REPOSITORY}.git . git checkout ${GITHUB_SHA} - name: Login to Gitea Container Registry diff --git a/tests/apps/core/test_background_jobs.py b/tests/apps/core/test_background_jobs.py index 756c4d9..ced7066 100644 --- a/tests/apps/core/test_background_jobs.py +++ b/tests/apps/core/test_background_jobs.py @@ -1,9 +1,11 @@ """Тесты для BackgroundJob.""" +from django.test import TestCase + +from faker import Faker + from apps.core.models import BackgroundJob, JobStatus from apps.core.services import BackgroundJobService -from django.test import TestCase -from faker import Faker fake = Faker() diff --git a/tests/apps/core/test_services.py b/tests/apps/core/test_services.py index e7b2c2e..4c41ae2 100644 --- a/tests/apps/core/test_services.py +++ b/tests/apps/core/test_services.py @@ -1,9 +1,10 @@ """Tests for core services""" +from django.contrib.auth import get_user_model +from django.test import TestCase + from apps.core.exceptions import NotFoundError from apps.core.services import BaseService -from django.contrib.auth import get_user_model -from django.test import TestCase User = get_user_model() diff --git a/tests/apps/core/test_signals.py b/tests/apps/core/test_signals.py index 4444401..ad1dfa0 100644 --- a/tests/apps/core/test_signals.py +++ b/tests/apps/core/test_signals.py @@ -1,6 +1,12 @@ """Tests for core signals utilities""" +from django.contrib.auth import get_user_model +from django.db.models.signals import post_save, pre_save +from django.test import TestCase + +from tests.apps.user.factories import UserFactory + from apps.core.signals import ( SignalDispatcher, emit_password_changed, @@ -12,11 +18,6 @@ from apps.core.signals import ( user_registered, user_verified, ) -from django.contrib.auth import get_user_model -from django.db.models.signals import post_save, pre_save -from django.test import TestCase - -from tests.apps.user.factories import UserFactory User = get_user_model() diff --git a/tests/apps/parsers/test_clients.py b/tests/apps/parsers/test_clients.py index 30bc53e..f1452b5 100644 --- a/tests/apps/parsers/test_clients.py +++ b/tests/apps/parsers/test_clients.py @@ -3,15 +3,17 @@ from io import BytesIO from unittest.mock import patch +from django.test import TestCase, tag + +from faker import Faker +from openpyxl import Workbook + from apps.parsers.clients.base import BaseHTTPClient, HTTPClientError from apps.parsers.clients.minpromtorg.industrial import IndustrialProductionClient from apps.parsers.clients.minpromtorg.manufactures import ManufacturesClient from apps.parsers.clients.minpromtorg.schemas import IndustrialCertificate, Manufacturer from apps.parsers.clients.proverki import ProverkiClient from apps.parsers.clients.proverki.schemas import Inspection -from django.test import TestCase, tag -from faker import Faker -from openpyxl import Workbook fake = Faker("ru_RU") diff --git a/tests/apps/parsers/test_services.py b/tests/apps/parsers/test_services.py index a12d7a1..1d84c1f 100644 --- a/tests/apps/parsers/test_services.py +++ b/tests/apps/parsers/test_services.py @@ -1,5 +1,9 @@ """Tests for parsers services.""" +from django.test import TestCase + +from faker import Faker + from apps.parsers.clients.minpromtorg.schemas import IndustrialCertificate, Manufacturer from apps.parsers.clients.proverki.schemas import Inspection from apps.parsers.models import ( @@ -16,8 +20,6 @@ from apps.parsers.services import ( ParserLoadLogService, ProxyService, ) -from django.test import TestCase -from faker import Faker from .factories import ( IndustrialCertificateRecordFactory, @@ -585,9 +587,10 @@ class InspectionServiceTest(TestCase): self.assertEqual(record.load_batch, 1) # Original batch +from django.test import tag + from apps.parsers.clients.base import HTTPClientError from apps.parsers.clients.minpromtorg.industrial import IndustrialProductionClient -from django.test import tag @tag("integration", "slow", "network", "e2e")