Skip to content

Commit

Permalink
Removed the code and test files from noisepy. Add a dependency on the…
Browse files Browse the repository at this point in the history
… new noisepy-seis-io and fixed the import statements
  • Loading branch information
IshikaKhandelwal committed Feb 9, 2024
1 parent baae80e commit f5c4375
Show file tree
Hide file tree
Showing 39 changed files with 68 additions and 2,586 deletions.
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"editor.defaultFormatter": "ms-python.black-formatter",
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.organizeImports": true
"source.organizeImports": "explicit"
}
},
"isort.args": [
Expand Down
8 changes: 4 additions & 4 deletions integration_tests/cc_stack_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
cross_correlate,
stack_cross_correlations,
)
from noisepy.seis.channelcatalog import (
from noisepy.seis.io.channelcatalog import (
XMLStationChannelCatalog, # Required stationXML handling object
)
from noisepy.seis.datatypes import ( # Main configuration object
from noisepy.seis.io.datatypes import ( # Main configuration object
CCMethod,
ConfigParameters,
StackMethod,
)
from noisepy.seis.numpystore import NumpyCCStore, NumpyStackStore
from noisepy.seis.scedc_s3store import ( # Object to query SCEDC data from on S3
from noisepy.seis.io.numpystore import NumpyCCStore, NumpyStackStore
from noisepy.seis.io.scedc_s3store import ( # Object to query SCEDC data from on S3
SCEDCS3DataStore,
channel_filter,
)
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ dependencies = [
"PyYAML==6.0",
"pydantic-yaml==1.0",
"psutil>=5.9.5,<6.0.0",
"noisepy-seis-io",
]


Expand Down
2 changes: 1 addition & 1 deletion script/test_whiten.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import scipy
from scipy.fftpack import next_fast_len

from noisepy.seis.datatypes import FreqNorm
from noisepy.seis.io.datatypes import FreqNorm
from noisepy.seis.noise_module import moving_ave, whiten


Expand Down
2 changes: 1 addition & 1 deletion script/write_speed/write.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import pyasdf
import zarr

from noisepy.seis.io.utils import fs_join, get_filesystem
from noisepy.seis.tiledb import _TileDBHelper
from noisepy.seis.utils import fs_join, get_filesystem

logger = logging.getLogger(__name__)
s3_path = "s3://<bucket>/write_speed/"
Expand Down
3 changes: 2 additions & 1 deletion src/noisepy/seis/S0B_to_ASDF_2019.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
import pyasdf
from mpi4py import MPI

from noisepy.seis.io.datatypes import RmResp

from . import noise_module
from .datatypes import RmResp

if not sys.warnoptions:
import warnings
Expand Down
264 changes: 0 additions & 264 deletions src/noisepy/seis/asdfstore.py

This file was deleted.

40 changes: 0 additions & 40 deletions src/noisepy/seis/channel_filter_store.py

This file was deleted.

Loading

0 comments on commit f5c4375

Please sign in to comment.