Skip to content

Commit

Permalink
Revert "Ruff fix"
Browse files Browse the repository at this point in the history
This reverts commit 52ae086.
  • Loading branch information
mraspaud committed Aug 28, 2024
1 parent b1204de commit 247c770
Show file tree
Hide file tree
Showing 20 changed files with 29 additions and 31 deletions.
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ exclude: '^$'
fail_fast: false

repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
#- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: 'v0.3.2'
hooks:
- id: ruff
args: [--fix]
#rev: 'v0.3.2'
#hooks:
#- id: ruff
#args: [--fix]
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
hooks:
Expand Down
1 change: 1 addition & 0 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
# All configuration values have a default; values that are commented out
# serve to show the default.

import sys, os

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
Expand Down
1 change: 0 additions & 1 deletion pygac/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"install').")

import logging

from pygac.configuration import get_config, read_config_file # noqa
from pygac.runner import get_reader_class, process_file # noqa

Expand Down
1 change: 0 additions & 1 deletion pygac/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import logging
import os
import sys

try:
import configparser
except ImportError:
Expand Down
5 changes: 2 additions & 3 deletions pygac/correct_tsm_issue.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@
an orbit contain corrupt data. This module identifies affected pixels and flags
them with fill values."""

import datetime

import bottleneck as bn
import numpy as np
import bottleneck as bn
import datetime

TSM_AFFECTED_INTERVALS_POD = {
3: [(datetime.datetime(2001, 10, 19, 4, 50), datetime.datetime(2001, 10, 19, 13, 38)),
Expand Down
2 changes: 1 addition & 1 deletion pygac/gac_io.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import h5py
import numpy as np

from pygac.utils import check_user_scanlines, slice_channel, strip_invalid_lat
from pygac.utils import slice_channel, strip_invalid_lat, check_user_scanlines

LOG = logging.getLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion pygac/gac_pod.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@

import numpy as np

from pygac.gac_reader import GACReader
from pygac.pod_reader import PODReader, main_pod
from pygac.gac_reader import GACReader

LOG = logging.getLogger(__name__)

Expand Down
2 changes: 2 additions & 0 deletions pygac/gac_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
import pygac.pygac_geotiepoints as gtp
from pygac.pygac_geotiepoints import GAC_LONLAT_SAMPLE_POINTS
from pygac.reader import Reader, ReaderError
import pygac.pygac_geotiepoints as gtp


LOG = logging.getLogger(__name__)

Expand Down
1 change: 0 additions & 1 deletion pygac/klm_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@

import datetime
import logging

try:
from enum import IntFlag
except ImportError:
Expand Down
2 changes: 1 addition & 1 deletion pygac/lac_pod.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@

import numpy as np

from pygac.lac_reader import LACReader
from pygac.pod_reader import PODReader, main_pod
from pygac.lac_reader import LACReader

LOG = logging.getLogger(__name__)

Expand Down
2 changes: 2 additions & 0 deletions pygac/lac_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
import pygac.pygac_geotiepoints as gtp
from pygac.pygac_geotiepoints import LAC_LONLAT_SAMPLE_POINTS
from pygac.reader import Reader, ReaderError
import pygac.pygac_geotiepoints as gtp


LOG = logging.getLogger(__name__)

Expand Down
1 change: 1 addition & 0 deletions pygac/pygac_geotiepoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@


import geotiepoints as gtp

import numpy as np

GAC_LONLAT_SAMPLE_POINTS = np.arange(4, 405, 8)
Expand Down
3 changes: 2 additions & 1 deletion pygac/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,13 @@ class for a given file.
import logging
import os

from pygac.configuration import get_config
from pygac.gac_klm import GACKLMReader
from pygac.gac_pod import GACPODReader
from pygac.lac_klm import LACKLMReader
from pygac.lac_pod import LACPODReader
from pygac.utils import file_opener
from pygac.configuration import get_config


LOG = logging.getLogger(__name__)

Expand Down
3 changes: 2 additions & 1 deletion pygac/tests/test_angles.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@

import numpy as np

from pygac.utils import centered_modulus, get_absolute_azimuth_angle_diff
from pygac.utils import (get_absolute_azimuth_angle_diff,
centered_modulus)


class TestAngles(unittest.TestCase):
Expand Down
2 changes: 0 additions & 2 deletions pygac/tests/test_io.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,12 @@
"""Test the I/O."""

import unittest

try:
import mock
except ImportError:
from unittest import mock
import numpy as np
import numpy.testing

import pygac.gac_io as gac_io
import pygac.utils as utils

Expand Down
6 changes: 2 additions & 4 deletions pygac/tests/test_pod.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,19 @@
"""Test module for the pod reading."""

import datetime as dt
import sys
import unittest

import numpy as np
import numpy.testing

import sys
try:
from unittest import mock
except ImportError:
import mock

from pygac.clock_offsets_converter import txt as clock_offsets_txt
from pygac.reader import ReaderError, NoTLEData
from pygac.gac_pod import GACPODReader
from pygac.lac_pod import LACPODReader
from pygac.reader import NoTLEData, ReaderError
from pygac.tests.utils import CalledWithArray


Expand Down
4 changes: 1 addition & 3 deletions pygac/tests/test_slerp.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@


import unittest

import numpy as np

from pygac.slerp import slerp
import numpy as np


class TestSlerp(unittest.TestCase):
Expand Down
3 changes: 1 addition & 2 deletions pygac/tests/test_tsm.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@
"""Test TSM module."""

import unittest
import pygac.correct_tsm_issue as tsm

import numpy as np
import numpy.testing

import pygac.correct_tsm_issue as tsm


class TSMTest(unittest.TestCase):
"""Test TSM module."""
Expand Down
2 changes: 1 addition & 1 deletion pygac/tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

import numpy as np

from pygac.utils import calculate_sun_earth_distance_correction, file_opener
from pygac.utils import file_opener, calculate_sun_earth_distance_correction


class TestUtils(unittest.TestCase):
Expand Down
7 changes: 4 additions & 3 deletions pygac/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import gzip
import io
import logging

from contextlib import contextmanager, nullcontext

import numpy as np
Expand Down Expand Up @@ -198,9 +199,9 @@ def _slice(ch, start_line, end_line, update=None):
ch_slc = ch[start_line:end_line + 1, :].copy()

if update:
updated = [_update_scanline(line, start_line, end_line)
if line is not None else None
for line in update]
updated = [_update_scanline(l, start_line, end_line)
if l is not None else None
for l in update]
return ch_slc, updated

return ch_slc
Expand Down

0 comments on commit 247c770

Please sign in to comment.