Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Python - run isort and remove unused imports in the test folder
  • Loading branch information
Gustry committed Feb 3, 2023
1 parent f23bdbd commit 651d2f0
Show file tree
Hide file tree
Showing 535 changed files with 4,790 additions and 5,622 deletions.
13 changes: 13 additions & 0 deletions .flake8 → setup.cfg
@@ -1,6 +1,7 @@
[flake8]
ignore =
# module imported but unused
# done in the "tests" folder
F401,
# module level import not at top of file
E402,
Expand Down Expand Up @@ -129,3 +130,15 @@ exclude =
# People using a virtualenv
.venv/
venv/

[isort]
multi_line_output = 3
include_trailing_comma = True
use_parentheses = True
ensure_newline_before_comments = True
lines_between_types = 1
skip =
.venv,
venv,
# Clean later
python,
2 changes: 1 addition & 1 deletion tests/code_layout/doxygen_parser.py
Expand Up @@ -19,9 +19,9 @@
__date__ = 'May 2017'
__copyright__ = '(C) 2017, Denis Rouzaud'

import re
import glob
import os
import re

try:
import xml.etree.ElementTree as ET
Expand Down
10 changes: 7 additions & 3 deletions tests/code_layout/test_qgsdoccoverage.py
Expand Up @@ -11,15 +11,19 @@

import os
import sys

try:
from qgis.static_testing import unittest
except ImportError:
import unittest

from termcolor import colored

from acceptable_missing_doc import (
ACCEPTABLE_MISSING_ADDED_NOTE,
ACCEPTABLE_MISSING_BRIEF,
ACCEPTABLE_MISSING_DOCS,
)
from doxygen_parser import DoxygenParser
from acceptable_missing_doc import ACCEPTABLE_MISSING_DOCS, ACCEPTABLE_MISSING_ADDED_NOTE, ACCEPTABLE_MISSING_BRIEF
from termcolor import colored

# TO regenerate the list:
# uncomment the lines under the `# GEN LIST` in tests/code_layout/doxygen_parser.py
Expand Down
16 changes: 8 additions & 8 deletions tests/code_layout/test_qgssipcoverage.py
Expand Up @@ -10,19 +10,19 @@
__copyright__ = 'Copyright 2015, The QGIS Project'

import os
from qgis.testing import unittest

# Import all the things!
from qgis.analysis import * # NOQA
from qgis.core import * # NOQA
from qgis.gui import * # NOQA
from qgis.testing import unittest
from termcolor import colored
from utilities import printImportant
from doxygen_parser import DoxygenParser

from termcolor import colored
from doxygen_parser import DoxygenParser

# Import all the things!
from qgis.analysis import * # NOQA
from qgis.core import * # NOQA
from qgis.gui import * # NOQA
try:
from qgis.server import * # NOQA
from qgis.server import * # NOQA
except:
pass

Expand Down
18 changes: 7 additions & 11 deletions tests/src/python/featuresourcetestbase.py
Expand Up @@ -11,21 +11,17 @@
__date__ = '2017-05-25'
__copyright__ = 'Copyright 2017, The QGIS Project'

from qgis.PyQt.QtCore import QDate, QDateTime, Qt, QTime
from qgis.core import (
QgsRectangle,
QgsFeatureRequest,
NULL,
QgsCoordinateReferenceSystem,
QgsFeature,
QgsWkbTypes,
QgsProject,
QgsFeatureRequest,
QgsGeometry,
QgsAbstractFeatureIterator,
QgsExpressionContextScope,
QgsExpressionContext,
QgsVectorLayerFeatureSource,
QgsCoordinateReferenceSystem,
NULL
QgsProject,
QgsRectangle,
QgsWkbTypes,
)
from qgis.PyQt.QtCore import Qt, QDate, QTime, QDateTime

from utilities import compareWkt

Expand Down
8 changes: 4 additions & 4 deletions tests/src/python/mockedwebserver.py
Expand Up @@ -28,12 +28,12 @@
# DEALINGS IN THE SOFTWARE.
###############################################################################

from http.server import BaseHTTPRequestHandler, HTTPServer
from threading import Thread

import contextlib
import time
import sys
import time

from http.server import BaseHTTPRequestHandler, HTTPServer
from threading import Thread

do_log = False
custom_handler = None
Expand Down
6 changes: 3 additions & 3 deletions tests/src/python/offlineditingtestbase.py
Expand Up @@ -26,13 +26,13 @@
from time import sleep

from qgis.core import (
QgsExpression,
QgsFeature,
QgsFeatureRequest,
QgsGeometry,
QgsOfflineEditing,
QgsPointXY,
QgsFeatureRequest,
QgsExpression,
QgsProject,
QgsOfflineEditing,
)

# Tet features, fields: [id, name, geometry]
Expand Down
42 changes: 14 additions & 28 deletions tests/src/python/provider_python.py
Expand Up @@ -12,43 +12,29 @@
__date__ = '2018-03-18'
__copyright__ = 'Copyright 2018, The QGIS Project'

from qgis.PyQt.QtCore import QVariant
from qgis.core import (
Qgis,
QgsField,
QgsFields,
QgsLayerDefinition,
QgsPointXY,
QgsReadWriteContext,
QgsVectorLayer,
QgsFeatureRequest,
QgsFeature,
QgsGeometry,
QgsProject,
QgsWkbTypes,
QgsAbstractFeatureIterator,
QgsAbstractFeatureSource,
QgsCoordinateTransform,
QgsCsException,
QgsDataProvider,
QgsExpression,
QgsExpressionContext,
QgsExpressionContextUtils,
NULL,
QgsCoordinateTransform,
QgsMemoryProviderUtils,
QgsCoordinateReferenceSystem,
QgsRectangle,
QgsTestUtils,
QgsVectorDataProvider,
QgsAbstractFeatureSource,
QgsAbstractFeatureIterator,
QgsFeature,
QgsFeatureIterator,
QgsApplication,
QgsProviderRegistry,
QgsProviderMetadata,
QgsGeometryEngine,
QgsFeatureRequest,
QgsFields,
QgsGeometry,
QgsProject,
QgsRectangle,
QgsSpatialIndex,
QgsDataProvider,
QgsCsException,
QgsVectorDataProvider,
QgsVectorLayer,
)

from qgis.PyQt.QtCore import QVariant


class PyFeatureIterator(QgsAbstractFeatureIterator):

Expand Down
29 changes: 14 additions & 15 deletions tests/src/python/providertestbase.py
Expand Up @@ -11,30 +11,29 @@
__date__ = '2015-04-27'
__copyright__ = 'Copyright 2015, The QGIS Project'

from qgis.PyQt.QtCore import QDate, QDateTime, Qt, QTime, QVariant
from qgis.PyQt.QtTest import QSignalSpy
from qgis.core import (
QgsApplication,
QgsRectangle,
QgsFeatureRequest,
QgsFeature,
QgsGeometry,
NULL,
QgsAbstractFeatureIterator,
QgsExpressionContextScope,
QgsExpressionContext,
QgsApplication,
QgsDataProvider,
QgsExpression,
QgsVectorDataProvider,
QgsVectorLayerFeatureSource,
QgsExpressionContext,
QgsExpressionContextScope,
QgsFeature,
QgsFeatureRequest,
QgsFeatureSink,
QgsTestUtils,
QgsFeatureSource,
QgsFieldConstraints,
QgsDataProvider,
QgsGeometry,
QgsRectangle,
QgsTestUtils,
QgsVectorDataProvider,
QgsVectorLayerFeatureSource,
QgsVectorLayerUtils,
NULL
)
from qgis.PyQt.QtCore import Qt, QDate, QTime, QDateTime, QVariant
from qgis.PyQt.QtTest import QSignalSpy

from utilities import compareWkt
from featuresourcetestbase import FeatureSourceTestCase


Expand Down
17 changes: 7 additions & 10 deletions tests/src/python/qgis_local_server.py
Expand Up @@ -10,31 +10,28 @@
__date__ = '2014/02/11'
__copyright__ = 'Copyright 2014, The QGIS Project'

import sys
import os
import shutil
import platform
import shutil
import subprocess
import sys
import tempfile
import time
import urllib.request
import urllib.parse
import urllib.error
import urllib.request
import urllib.error
import urllib.parse
import tempfile
import urllib.request

from utilities import (
unitTestDataPath,
getExecutablePath,
getTempfilePath,
openInBrowserTab,
getTempfilePath
unitTestDataPath,
)

# allow import error to be raised if qgis is not on sys.path
try:
# noinspection PyUnresolvedReferences
from qgis.core import QgsRectangle, QgsCoordinateReferenceSystem
from qgis.core import QgsCoordinateReferenceSystem, QgsRectangle
except ImportError as e:
raise ImportError(str(e) + '\n\nPlace path to pyqgis modules on sys.path,'
' or assign to PYTHONPATH')
Expand Down
20 changes: 14 additions & 6 deletions tests/src/python/qgis_wrapped_server.py
Expand Up @@ -124,17 +124,24 @@
# executions
os.environ['QT_HASH_SEED'] = '1'

import sys
import copy
import math
import signal
import ssl
import math
import copy
import sys
import urllib.parse

from http.server import BaseHTTPRequestHandler, HTTPServer
from socketserver import ThreadingMixIn

from qgis.core import QgsApplication
from qgis.server import QgsServer, QgsServerRequest, QgsBufferServerRequest, QgsBufferServerResponse, QgsServerFilter
from qgis.server import (
QgsBufferServerRequest,
QgsBufferServerResponse,
QgsServer,
QgsServerFilter,
QgsServerRequest,
)

QGIS_SERVER_PORT = int(os.environ.get('QGIS_SERVER_PORT', '8081'))
QGIS_SERVER_HOST = os.environ.get('QGIS_SERVER_HOST', '127.0.0.1')
Expand Down Expand Up @@ -258,10 +265,11 @@ def requestReady(self):
qgs_server.serverInterface().registerFilter(xyzfilter)

if QGIS_SERVER_OAUTH2_AUTH:
from qgis.server import QgsServerFilter
from oauthlib.oauth2 import RequestValidator, LegacyApplicationServer
from datetime import datetime

from oauthlib.oauth2 import LegacyApplicationServer, RequestValidator
from qgis.server import QgsServerFilter

# Naive token storage implementation
_tokens = {}

Expand Down
20 changes: 9 additions & 11 deletions tests/src/python/qgslayermetadataprovidertestbase.py
Expand Up @@ -11,24 +11,22 @@
__date__ = '2022-08-19'
__copyright__ = 'Copyright 2022, ItOpen'

import os

from qgis.PyQt.QtCore import QCoreApplication
from qgis.core import (
QgsVectorLayer,
QgsRasterLayer,
QgsMapLayerType,
QgsProviderRegistry,
QgsWkbTypes,
QgsBox3d,
QgsLayerMetadata,
QgsMapLayerType,
QgsMetadataSearchContext,
QgsProviderMetadata,
QgsBox3d,
QgsProviderRegistry,
QgsRasterLayer,
QgsRectangle,
QgsMetadataSearchContext,
QgsVectorLayer,
QgsWkbTypes,
)
from qgis.testing import start_app

from qgis.PyQt.QtCore import QCoreApplication
from utilities import compareWkt, unitTestDataPath
from qgis.testing import start_app

QGIS_APP = start_app()
TEST_DATA_DIR = unitTestDataPath()
Expand Down
5 changes: 2 additions & 3 deletions tests/src/python/qgslayoutchecker.py
Expand Up @@ -15,10 +15,9 @@
'''

import qgis # NOQA

from qgis.PyQt.QtCore import QSize, QDir, QFileInfo
from qgis.PyQt.QtCore import QDir, QFileInfo, QSize
from qgis.PyQt.QtGui import QImage, QPainter
from qgis.core import QgsMultiRenderChecker, QgsLayoutExporter
from qgis.core import QgsLayoutExporter, QgsMultiRenderChecker


class QgsLayoutChecker(QgsMultiRenderChecker):
Expand Down

0 comments on commit 651d2f0

Please sign in to comment.