Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused modules #1051

Closed
wants to merge 8 commits into from
Closed
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: 0 additions & 1 deletion conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from pytest import TempPathFactory
import cProfile
import pstats
import mock
import yaml

# ==============================================================================
Expand Down
4 changes: 1 addition & 3 deletions crds/certify/certify.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import os
from collections import defaultdict
import gc
import uuid
import re

import asdf
Expand All @@ -18,14 +17,13 @@
import crds

from crds.core import pysh, log, config, utils, rmap, cmdline
from crds.core.exceptions import InvalidFormatError, ValidationError, MissingKeywordError, MappingInsertionError
from crds.core.exceptions import InvalidFormatError, ValidationError, MissingKeywordError
from crds.core import reftypes

from crds import data_file, diff
from crds.io import tables
from crds.client import api
from crds.refactoring import refactor
# from crds.io import abstract

from . import mapping_parser
from . import validators
Expand Down
2 changes: 1 addition & 1 deletion crds/certify/mapping_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"""
from collections import namedtuple

from crds.core import rmap, selectors, log, exceptions, config
from crds.core import selectors, log, exceptions, config

# NOTE: #-comments are treated as white space and currently dropped when an rmap is rewritten
# as a new version.
Expand Down
2 changes: 1 addition & 1 deletion crds/certify/validators/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from crds.core import log, utils, timestamp, selectors, config
from crds.core.exceptions import MissingKeywordError, IllegalKeywordError
from crds.core.exceptions import TpnDefinitionError, RequiredConditionError
from crds.core.exceptions import BadKernelSumError, BadKernelCenterPixelTooSmall
from crds.core.exceptions import BadKernelSumError
from crds.core import generic_tpn
from crds.core.generic_tpn import TpnInfo # generic TpnInfo code
from crds.io import tables
Expand Down
2 changes: 1 addition & 1 deletion crds/certify/validators/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
(particularly *array*.tpn) for examples of presence or constraint expressions, grep
those files for these functions.
"""
from crds.core import utils, exceptions
from crds.core import exceptions

# ----------------------------------------------------------------------------

Expand Down
2 changes: 0 additions & 2 deletions crds/client/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
import zlib
import html
from urllib import request
import warnings
import json
import ast

# ==============================================================================
Expand Down
1 change: 0 additions & 1 deletion crds/core/naming.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import re

from . import config, log, utils
from .exceptions import NameComparisonError
from .constants import ALL_OBSERVATORIES

# =============================================================================================================
Expand Down
2 changes: 0 additions & 2 deletions crds/core/pysh.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@
import inspect
import shlex

from io import StringIO

from subprocess import PIPE, STDOUT, Popen

# =========================================================================
Expand Down
5 changes: 1 addition & 4 deletions crds/core/rmap.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,14 @@
from . import log, utils, config, selectors, substitutions

# XXX For backward compatability until refactored away.
from .config import locate_file, locate_mapping, locate_reference
from .config import mapping_exists, is_mapping
from .config import locate_file, locate_mapping

from . import exceptions as crexc
from .custom_dict import LazyFileDict
from .mapping_verifier import MAPPING_VERIFIER
from .log import srepr
from .constants import ALL_OBSERVATORIES, INSTRUMENT_KEYWORDS

# from crds import data_file (deferred to actual uses)

# ===================================================================

__all__ = [
Expand Down
4 changes: 0 additions & 4 deletions crds/core/selectors.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,6 @@
import numbers
from collections import namedtuple
import ast
import copy
from pprint import pprint as pp

# import numpy as np

# ==============================================================================

Expand Down
8 changes: 2 additions & 6 deletions crds/data_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,9 @@

# =============================================================================

from crds.io.abstract import hijack_warnings, convert_to_eval_header, ensure_keys_defined
from crds.io.factory import file_factory, get_observatory, get_filetype, is_dataset
from crds.io.geis import is_geis, is_geis_data, is_geis_header, get_conjugate
from crds.io.fits import fits_open, fits_open_trapped, get_fits_header_union
from crds.io.abstract import hijack_warnings
from crds.io.factory import file_factory

# import asdf
# import yaml

# =============================================================================

Expand Down
5 changes: 0 additions & 5 deletions crds/hst/acs.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
"""Master ACS hooks module, importer of versioned hooks."""

from .acs_v1 import precondition_header_acs_biasfile_v1 # , acs_biasfile_filter
from .acs_v2 import precondition_header_acs_biasfile_v2, fallback_header_acs_biasfile_v2 # , acs_biasfile_filter, acs_darkfile_filter
from .acs_v3 import precondition_header_acs_biasfile_v3, fallback_header_acs_biasfile_v3, acs_biasfile_filter, acs_darkfile_filter

#
# This section contains relevant code from cdbsquery.py and explanation, such as it is.
# cdbsquery.py was/is part of CDBS. This module is about capturing those quirks in different
Expand Down
5 changes: 1 addition & 4 deletions crds/hst/acs_common.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
"""Common imports and defs across all versions of ACS hooks.
"""
import sys
from collections import defaultdict

from crds.core import rmap, log, utils, timestamp
from crds.core import timestamp

# ===========================================================================

Expand Down
3 changes: 1 addition & 2 deletions crds/hst/locate.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@
import os.path
import datetime
import time
import warnings

# =======================================================================

from crds.core import log, rmap, config, utils, timestamp
from crds import data_file
from crds.core.exceptions import CrdsError, CrdsNamingError
from crds.core.exceptions import CrdsNamingError
from crds.hst import siname
from crds.io import abstract

Expand Down
10 changes: 1 addition & 9 deletions crds/jwst/locate.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,10 @@
"""
import os.path
import re
import warnings

from asdf.tags.core import NDArrayType
from stdatamodels.validate import ValidationWarning

# =======================================================================

from crds.core import rmap, config, utils, timestamp, log, exceptions
from crds.certify import generic_tpn
from crds import data_file
from crds.io import abstract

Expand All @@ -25,21 +20,18 @@
# These two functions decouple the generic reference file certifier program
# from observatory-unique ways of specifying and caching Validator parameters.

from crds.jwst import TYPES, INSTRUMENTS, FILEKINDS, EXTENSIONS, INSTRUMENT_FIXERS, TYPE_FIXERS
from crds.jwst import TYPES, INSTRUMENTS, FILEKINDS

from . import schema

# definitively lists possible exp_types by instrument, or all instruments
from .schema import get_exptypes

get_row_keys_by_instrument = TYPES.get_row_keys_by_instrument
get_item = TYPES.get_item
suffix_to_filekind = TYPES.suffix_to_filekind
filekind_to_suffix = TYPES.filekind_to_suffix
get_all_tpninfos = TYPES.get_all_tpninfos

from crds.jwst.pipeline import header_to_reftypes, header_to_pipelines

# =======================================================================

MODEL = None
Expand Down
2 changes: 1 addition & 1 deletion crds/refactoring/refactor.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

# ============================================================================

from crds.core import exceptions, rmap, log, cmdline, utils
from crds.core import rmap, log, cmdline, utils
from crds.core.log import srepr
from crds import diff

Expand Down
5 changes: 0 additions & 5 deletions crds/roman/locate.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,12 @@
"""
import os.path
import re
import warnings
from collections import namedtuple

from asdf.tags.core import NDArrayType

# =======================================================================

from crds.core import rmap, config, utils, timestamp, log, exceptions
from crds.certify import generic_tpn
from crds import data_file
from crds.io import abstract

# =======================================================================

Expand Down
2 changes: 0 additions & 2 deletions setup_data.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#!/usr/bin/env python
import sys
import glob

from distutils.core import setup

Expand Down
6 changes: 3 additions & 3 deletions test/bestrefs/test_table_effects.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
"""This tests, through the use of bestrefs, the functioning of table effects."""
from pathlib import Path
# from pathlib import Path
from pytest import mark

from crds.core import log, utils
from crds import data_file
from crds.core import log #, utils
# from crds import data_file

from crds.bestrefs import BestrefsScript

Expand Down
2 changes: 1 addition & 1 deletion test/core/test_rmap.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import os
import json
import pickle
import sys
# import sys
import crds
from crds import rmap, log, utils
from crds import config as crds_config
Expand Down
2 changes: 1 addition & 1 deletion test/test_diff.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
----------
"""
import subprocess
import os
# import os
import asdf
from pytest import mark, fixture
from crds.diff import DiffScript
Expand Down
2 changes: 1 addition & 1 deletion test/test_rowdiff.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from pathlib import Path
from pytest import mark

from crds.core import log, utils
from crds.core import log #, utils

from crds.rowdiff import RowDiffScript

Expand Down
Loading