From 36de357cd5767a1cf9adbee73ab1255506f50c23 Mon Sep 17 00:00:00 2001 From: jameswilburlewis Date: Fri, 23 Aug 2024 12:10:30 -0700 Subject: [PATCH] Moving akebono, barrel, and cluster to the projects directory --- pyspedas/__init__.py | 6 +++--- pyspedas/{ => projects}/akebono/README.md | 0 pyspedas/{ => projects}/akebono/__init__.py | 0 pyspedas/{ => projects}/akebono/config.py | 0 pyspedas/{ => projects}/akebono/load.py | 0 pyspedas/{ => projects}/akebono/load_csv_file.py | 0 pyspedas/{ => projects}/akebono/orb.py | 0 pyspedas/{ => projects}/akebono/orb_postprocessing.py | 0 pyspedas/{ => projects}/akebono/pws.py | 0 pyspedas/{ => projects}/akebono/pws_postprocessing.py | 0 pyspedas/{ => projects}/akebono/rdm.py | 0 pyspedas/{ => projects}/akebono/rdm_postprocessing.py | 0 pyspedas/{ => projects}/akebono/tests/__init__.py | 0 pyspedas/{ => projects}/akebono/tests/tests.py | 0 pyspedas/{ => projects}/barrel/README.md | 0 pyspedas/{ => projects}/barrel/__init__.py | 0 pyspedas/{ => projects}/barrel/config.py | 0 pyspedas/{ => projects}/barrel/ephm.py | 0 pyspedas/{ => projects}/barrel/fspc.py | 0 pyspedas/{ => projects}/barrel/hkpg.py | 0 pyspedas/{ => projects}/barrel/load.py | 0 pyspedas/{ => projects}/barrel/magn.py | 0 pyspedas/{ => projects}/barrel/mspc.py | 0 pyspedas/{ => projects}/barrel/rcnt.py | 0 pyspedas/{ => projects}/barrel/sspc.py | 0 pyspedas/{ => projects}/barrel/tests/__init__.py | 0 pyspedas/{ => projects}/barrel/tests/tests.py | 0 pyspedas/{ => projects}/cluster/README.md | 0 pyspedas/{ => projects}/cluster/__init__.py | 0 pyspedas/{ => projects}/cluster/aspoc.py | 0 pyspedas/{ => projects}/cluster/cis.py | 0 pyspedas/{ => projects}/cluster/config.py | 0 pyspedas/{ => projects}/cluster/datasets.py | 0 pyspedas/{ => projects}/cluster/dwp.py | 0 pyspedas/{ => projects}/cluster/edi.py | 0 pyspedas/{ => projects}/cluster/efw.py | 0 pyspedas/{ => projects}/cluster/fgm.py | 0 pyspedas/{ => projects}/cluster/load.py | 0 pyspedas/{ => projects}/cluster/load_csa.py | 2 +- pyspedas/{ => projects}/cluster/peace.py | 0 pyspedas/{ => projects}/cluster/rapid.py | 0 pyspedas/{ => projects}/cluster/staff.py | 0 pyspedas/{ => projects}/cluster/tests/__init__.py | 0 pyspedas/{ => projects}/cluster/tests/tests.py | 2 +- pyspedas/{ => projects}/cluster/wbd.py | 0 pyspedas/{ => projects}/cluster/whi.py | 0 46 files changed, 5 insertions(+), 5 deletions(-) rename pyspedas/{ => projects}/akebono/README.md (100%) rename pyspedas/{ => projects}/akebono/__init__.py (100%) rename pyspedas/{ => projects}/akebono/config.py (100%) rename pyspedas/{ => projects}/akebono/load.py (100%) rename pyspedas/{ => projects}/akebono/load_csv_file.py (100%) rename pyspedas/{ => projects}/akebono/orb.py (100%) rename pyspedas/{ => projects}/akebono/orb_postprocessing.py (100%) rename pyspedas/{ => projects}/akebono/pws.py (100%) rename pyspedas/{ => projects}/akebono/pws_postprocessing.py (100%) rename pyspedas/{ => projects}/akebono/rdm.py (100%) rename pyspedas/{ => projects}/akebono/rdm_postprocessing.py (100%) rename pyspedas/{ => projects}/akebono/tests/__init__.py (100%) rename pyspedas/{ => projects}/akebono/tests/tests.py (100%) rename pyspedas/{ => projects}/barrel/README.md (100%) rename pyspedas/{ => projects}/barrel/__init__.py (100%) rename pyspedas/{ => projects}/barrel/config.py (100%) rename pyspedas/{ => projects}/barrel/ephm.py (100%) rename pyspedas/{ => projects}/barrel/fspc.py (100%) rename pyspedas/{ => projects}/barrel/hkpg.py (100%) rename pyspedas/{ => projects}/barrel/load.py (100%) rename pyspedas/{ => projects}/barrel/magn.py (100%) rename pyspedas/{ => projects}/barrel/mspc.py (100%) rename pyspedas/{ => projects}/barrel/rcnt.py (100%) rename pyspedas/{ => projects}/barrel/sspc.py (100%) rename pyspedas/{ => projects}/barrel/tests/__init__.py (100%) rename pyspedas/{ => projects}/barrel/tests/tests.py (100%) rename pyspedas/{ => projects}/cluster/README.md (100%) rename pyspedas/{ => projects}/cluster/__init__.py (100%) rename pyspedas/{ => projects}/cluster/aspoc.py (100%) rename pyspedas/{ => projects}/cluster/cis.py (100%) rename pyspedas/{ => projects}/cluster/config.py (100%) rename pyspedas/{ => projects}/cluster/datasets.py (100%) rename pyspedas/{ => projects}/cluster/dwp.py (100%) rename pyspedas/{ => projects}/cluster/edi.py (100%) rename pyspedas/{ => projects}/cluster/efw.py (100%) rename pyspedas/{ => projects}/cluster/fgm.py (100%) rename pyspedas/{ => projects}/cluster/load.py (100%) rename pyspedas/{ => projects}/cluster/load_csa.py (99%) rename pyspedas/{ => projects}/cluster/peace.py (100%) rename pyspedas/{ => projects}/cluster/rapid.py (100%) rename pyspedas/{ => projects}/cluster/staff.py (100%) rename pyspedas/{ => projects}/cluster/tests/__init__.py (100%) rename pyspedas/{ => projects}/cluster/tests/tests.py (99%) rename pyspedas/{ => projects}/cluster/wbd.py (100%) rename pyspedas/{ => projects}/cluster/whi.py (100%) diff --git a/pyspedas/__init__.py b/pyspedas/__init__.py index c86b19b4..e6aa1743 100644 --- a/pyspedas/__init__.py +++ b/pyspedas/__init__.py @@ -83,9 +83,9 @@ # Make mission-specific namespaces available under pyspedas from .projects import ace -from . import akebono -from . import barrel -from . import cluster +from .projects import akebono +from .projects import barrel +from .projects import cluster from . import cnofs from . import csswe from . import de2 diff --git a/pyspedas/akebono/README.md b/pyspedas/projects/akebono/README.md similarity index 100% rename from pyspedas/akebono/README.md rename to pyspedas/projects/akebono/README.md diff --git a/pyspedas/akebono/__init__.py b/pyspedas/projects/akebono/__init__.py similarity index 100% rename from pyspedas/akebono/__init__.py rename to pyspedas/projects/akebono/__init__.py diff --git a/pyspedas/akebono/config.py b/pyspedas/projects/akebono/config.py similarity index 100% rename from pyspedas/akebono/config.py rename to pyspedas/projects/akebono/config.py diff --git a/pyspedas/akebono/load.py b/pyspedas/projects/akebono/load.py similarity index 100% rename from pyspedas/akebono/load.py rename to pyspedas/projects/akebono/load.py diff --git a/pyspedas/akebono/load_csv_file.py b/pyspedas/projects/akebono/load_csv_file.py similarity index 100% rename from pyspedas/akebono/load_csv_file.py rename to pyspedas/projects/akebono/load_csv_file.py diff --git a/pyspedas/akebono/orb.py b/pyspedas/projects/akebono/orb.py similarity index 100% rename from pyspedas/akebono/orb.py rename to pyspedas/projects/akebono/orb.py diff --git a/pyspedas/akebono/orb_postprocessing.py b/pyspedas/projects/akebono/orb_postprocessing.py similarity index 100% rename from pyspedas/akebono/orb_postprocessing.py rename to pyspedas/projects/akebono/orb_postprocessing.py diff --git a/pyspedas/akebono/pws.py b/pyspedas/projects/akebono/pws.py similarity index 100% rename from pyspedas/akebono/pws.py rename to pyspedas/projects/akebono/pws.py diff --git a/pyspedas/akebono/pws_postprocessing.py b/pyspedas/projects/akebono/pws_postprocessing.py similarity index 100% rename from pyspedas/akebono/pws_postprocessing.py rename to pyspedas/projects/akebono/pws_postprocessing.py diff --git a/pyspedas/akebono/rdm.py b/pyspedas/projects/akebono/rdm.py similarity index 100% rename from pyspedas/akebono/rdm.py rename to pyspedas/projects/akebono/rdm.py diff --git a/pyspedas/akebono/rdm_postprocessing.py b/pyspedas/projects/akebono/rdm_postprocessing.py similarity index 100% rename from pyspedas/akebono/rdm_postprocessing.py rename to pyspedas/projects/akebono/rdm_postprocessing.py diff --git a/pyspedas/akebono/tests/__init__.py b/pyspedas/projects/akebono/tests/__init__.py similarity index 100% rename from pyspedas/akebono/tests/__init__.py rename to pyspedas/projects/akebono/tests/__init__.py diff --git a/pyspedas/akebono/tests/tests.py b/pyspedas/projects/akebono/tests/tests.py similarity index 100% rename from pyspedas/akebono/tests/tests.py rename to pyspedas/projects/akebono/tests/tests.py diff --git a/pyspedas/barrel/README.md b/pyspedas/projects/barrel/README.md similarity index 100% rename from pyspedas/barrel/README.md rename to pyspedas/projects/barrel/README.md diff --git a/pyspedas/barrel/__init__.py b/pyspedas/projects/barrel/__init__.py similarity index 100% rename from pyspedas/barrel/__init__.py rename to pyspedas/projects/barrel/__init__.py diff --git a/pyspedas/barrel/config.py b/pyspedas/projects/barrel/config.py similarity index 100% rename from pyspedas/barrel/config.py rename to pyspedas/projects/barrel/config.py diff --git a/pyspedas/barrel/ephm.py b/pyspedas/projects/barrel/ephm.py similarity index 100% rename from pyspedas/barrel/ephm.py rename to pyspedas/projects/barrel/ephm.py diff --git a/pyspedas/barrel/fspc.py b/pyspedas/projects/barrel/fspc.py similarity index 100% rename from pyspedas/barrel/fspc.py rename to pyspedas/projects/barrel/fspc.py diff --git a/pyspedas/barrel/hkpg.py b/pyspedas/projects/barrel/hkpg.py similarity index 100% rename from pyspedas/barrel/hkpg.py rename to pyspedas/projects/barrel/hkpg.py diff --git a/pyspedas/barrel/load.py b/pyspedas/projects/barrel/load.py similarity index 100% rename from pyspedas/barrel/load.py rename to pyspedas/projects/barrel/load.py diff --git a/pyspedas/barrel/magn.py b/pyspedas/projects/barrel/magn.py similarity index 100% rename from pyspedas/barrel/magn.py rename to pyspedas/projects/barrel/magn.py diff --git a/pyspedas/barrel/mspc.py b/pyspedas/projects/barrel/mspc.py similarity index 100% rename from pyspedas/barrel/mspc.py rename to pyspedas/projects/barrel/mspc.py diff --git a/pyspedas/barrel/rcnt.py b/pyspedas/projects/barrel/rcnt.py similarity index 100% rename from pyspedas/barrel/rcnt.py rename to pyspedas/projects/barrel/rcnt.py diff --git a/pyspedas/barrel/sspc.py b/pyspedas/projects/barrel/sspc.py similarity index 100% rename from pyspedas/barrel/sspc.py rename to pyspedas/projects/barrel/sspc.py diff --git a/pyspedas/barrel/tests/__init__.py b/pyspedas/projects/barrel/tests/__init__.py similarity index 100% rename from pyspedas/barrel/tests/__init__.py rename to pyspedas/projects/barrel/tests/__init__.py diff --git a/pyspedas/barrel/tests/tests.py b/pyspedas/projects/barrel/tests/tests.py similarity index 100% rename from pyspedas/barrel/tests/tests.py rename to pyspedas/projects/barrel/tests/tests.py diff --git a/pyspedas/cluster/README.md b/pyspedas/projects/cluster/README.md similarity index 100% rename from pyspedas/cluster/README.md rename to pyspedas/projects/cluster/README.md diff --git a/pyspedas/cluster/__init__.py b/pyspedas/projects/cluster/__init__.py similarity index 100% rename from pyspedas/cluster/__init__.py rename to pyspedas/projects/cluster/__init__.py diff --git a/pyspedas/cluster/aspoc.py b/pyspedas/projects/cluster/aspoc.py similarity index 100% rename from pyspedas/cluster/aspoc.py rename to pyspedas/projects/cluster/aspoc.py diff --git a/pyspedas/cluster/cis.py b/pyspedas/projects/cluster/cis.py similarity index 100% rename from pyspedas/cluster/cis.py rename to pyspedas/projects/cluster/cis.py diff --git a/pyspedas/cluster/config.py b/pyspedas/projects/cluster/config.py similarity index 100% rename from pyspedas/cluster/config.py rename to pyspedas/projects/cluster/config.py diff --git a/pyspedas/cluster/datasets.py b/pyspedas/projects/cluster/datasets.py similarity index 100% rename from pyspedas/cluster/datasets.py rename to pyspedas/projects/cluster/datasets.py diff --git a/pyspedas/cluster/dwp.py b/pyspedas/projects/cluster/dwp.py similarity index 100% rename from pyspedas/cluster/dwp.py rename to pyspedas/projects/cluster/dwp.py diff --git a/pyspedas/cluster/edi.py b/pyspedas/projects/cluster/edi.py similarity index 100% rename from pyspedas/cluster/edi.py rename to pyspedas/projects/cluster/edi.py diff --git a/pyspedas/cluster/efw.py b/pyspedas/projects/cluster/efw.py similarity index 100% rename from pyspedas/cluster/efw.py rename to pyspedas/projects/cluster/efw.py diff --git a/pyspedas/cluster/fgm.py b/pyspedas/projects/cluster/fgm.py similarity index 100% rename from pyspedas/cluster/fgm.py rename to pyspedas/projects/cluster/fgm.py diff --git a/pyspedas/cluster/load.py b/pyspedas/projects/cluster/load.py similarity index 100% rename from pyspedas/cluster/load.py rename to pyspedas/projects/cluster/load.py diff --git a/pyspedas/cluster/load_csa.py b/pyspedas/projects/cluster/load_csa.py similarity index 99% rename from pyspedas/cluster/load_csa.py rename to pyspedas/projects/cluster/load_csa.py index 57eced9e..7d1cb9d6 100644 --- a/pyspedas/cluster/load_csa.py +++ b/pyspedas/projects/cluster/load_csa.py @@ -20,7 +20,7 @@ import os from pathlib import Path from typing import List -from pyspedas.cluster.config import CONFIG +from .config import CONFIG def cl_master_datatypes(): diff --git a/pyspedas/cluster/peace.py b/pyspedas/projects/cluster/peace.py similarity index 100% rename from pyspedas/cluster/peace.py rename to pyspedas/projects/cluster/peace.py diff --git a/pyspedas/cluster/rapid.py b/pyspedas/projects/cluster/rapid.py similarity index 100% rename from pyspedas/cluster/rapid.py rename to pyspedas/projects/cluster/rapid.py diff --git a/pyspedas/cluster/staff.py b/pyspedas/projects/cluster/staff.py similarity index 100% rename from pyspedas/cluster/staff.py rename to pyspedas/projects/cluster/staff.py diff --git a/pyspedas/cluster/tests/__init__.py b/pyspedas/projects/cluster/tests/__init__.py similarity index 100% rename from pyspedas/cluster/tests/__init__.py rename to pyspedas/projects/cluster/tests/__init__.py diff --git a/pyspedas/cluster/tests/tests.py b/pyspedas/projects/cluster/tests/tests.py similarity index 99% rename from pyspedas/cluster/tests/tests.py rename to pyspedas/projects/cluster/tests/tests.py index a0cc933b..aef98089 100644 --- a/pyspedas/cluster/tests/tests.py +++ b/pyspedas/projects/cluster/tests/tests.py @@ -2,7 +2,7 @@ import unittest from pytplot import data_exists, del_data, tplot_names, tplot import pyspedas -from pyspedas.cluster.load_csa import cl_master_probes, cl_master_datatypes +from pyspedas.projects.cluster.load_csa import cl_master_probes, cl_master_datatypes diff --git a/pyspedas/cluster/wbd.py b/pyspedas/projects/cluster/wbd.py similarity index 100% rename from pyspedas/cluster/wbd.py rename to pyspedas/projects/cluster/wbd.py diff --git a/pyspedas/cluster/whi.py b/pyspedas/projects/cluster/whi.py similarity index 100% rename from pyspedas/cluster/whi.py rename to pyspedas/projects/cluster/whi.py