Skip to content

Commit

Permalink
move annotations import to __init__
Browse files Browse the repository at this point in the history
  • Loading branch information
dugalh committed Nov 10, 2023
1 parent f64a265 commit 1204d6a
Show file tree
Hide file tree
Showing 15 changed files with 3 additions and 16 deletions.
2 changes: 2 additions & 0 deletions orthority/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
# If not, see <https://www.gnu.org/licenses/>.

"""Orthorectification toolkit."""
# TODO: remove this when required python version is >=3.10
from __future__ import annotations
import os
import pathlib
from orthority.camera import create_camera, PinholeCamera, OpenCVCamera, BrownCamera, FisheyeCamera
Expand Down
2 changes: 0 additions & 2 deletions orthority/camera.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
# If not, see <https://www.gnu.org/licenses/>.

"""Camera models for projecting between 3D world and 2D pixel coordinates."""
from __future__ import annotations

import logging

import cv2
Expand Down
1 change: 0 additions & 1 deletion orthority/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# You should have received a copy of the GNU Affero General Public License along with Orthority.
# If not, see <https://www.gnu.org/licenses/>.

from __future__ import annotations
import argparse
import csv
import logging
Expand Down
1 change: 0 additions & 1 deletion orthority/enums.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# You should have received a copy of the GNU Affero General Public License along with Orthority.
# If not, see <https://www.gnu.org/licenses/>.

from __future__ import annotations
from enum import Enum

import cv2
Expand Down
1 change: 0 additions & 1 deletion orthority/exif.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
# If not, see <https://www.gnu.org/licenses/>.

"""EXIF / XMP image tag decoding and reading."""
from __future__ import annotations

import logging
from pathlib import Path
Expand Down
1 change: 0 additions & 1 deletion orthority/io.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
"""
# TODO: specify the dict formats with examples (maybe in its own doc)?
# TODO: could dataclasses be a better way of defining the int / ext parameter dicts?
from __future__ import annotations
import csv
import json
import logging
Expand Down
2 changes: 0 additions & 2 deletions orthority/ortho.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
# If not, see <https://www.gnu.org/licenses/>.

"""Orthrectification using DEM and camera model input."""
from __future__ import annotations
import logging
import multiprocessing
import threading
Expand All @@ -34,7 +33,6 @@
from orthority.errors import CrsError, CrsMissingError, DemBandError
from orthority.utils import expand_window_to_grid, nan_equals, profiler, suppress_no_georef


logger = logging.getLogger(__name__)


Expand Down
1 change: 0 additions & 1 deletion orthority/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"""Utility functions for internal use."""
# TODO: rename this module _utils, likewise version -> _version
# TODO: add module docstrings
from __future__ import annotations
import cProfile
import logging
import pstats
Expand Down
1 change: 1 addition & 0 deletions tests/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from __future__ import annotations
1 change: 0 additions & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# You should have received a copy of the GNU Affero General Public License along with Orthority.
# If not, see <https://www.gnu.org/licenses/>.

from __future__ import annotations
import csv
import json
import os
Expand Down
2 changes: 0 additions & 2 deletions tests/test_camera.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
# You should have received a copy of the GNU Affero General Public License along with Orthority.
# If not, see <https://www.gnu.org/licenses/>.

from __future__ import annotations

import numpy as np
import pytest

Expand Down
1 change: 0 additions & 1 deletion tests/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# You should have received a copy of the GNU Affero General Public License along with Orthority.
# If not, see <https://www.gnu.org/licenses/>.

from __future__ import annotations
import copy
import logging
import shutil
Expand Down
1 change: 0 additions & 1 deletion tests/test_exif.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# You should have received a copy of the GNU Affero General Public License along with Orthority.
# If not, see <https://www.gnu.org/licenses/>.

from __future__ import annotations
from pathlib import Path

from orthority.exif import Exif
Expand Down
1 change: 0 additions & 1 deletion tests/test_io.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# You should have received a copy of the GNU Affero General Public License along with Orthority.
# If not, see <https://www.gnu.org/licenses/>.

from __future__ import annotations
import csv
import json
from pathlib import Path
Expand Down
1 change: 0 additions & 1 deletion tests/test_ortho.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# You should have received a copy of the GNU Affero General Public License along with Orthority.
# If not, see <https://www.gnu.org/licenses/>.

from __future__ import annotations
import logging
from pathlib import Path

Expand Down

0 comments on commit 1204d6a

Please sign in to comment.