From 629bfe9f40d33ac4fdc8a1acf46ba7b9f00bd22c Mon Sep 17 00:00:00 2001 From: Alec Koumjian Date: Thu, 16 May 2024 13:36:12 -0400 Subject: [PATCH] Update package settigns --- .github/workflows/docker-build-lint-test.yml | 29 ---- .../pip-build-lint-test-coverage.yml | 11 +- pyproject.toml | 160 ++++++------------ {adam_core => src/adam_core}/__init__.py | 0 {adam_core => src/adam_core}/__version__.py | 0 {adam_core => src/adam_core}/constants.py | 0 .../adam_core}/coordinates/__init__.py | 0 .../adam_core}/coordinates/cartesian.py | 0 .../adam_core}/coordinates/cometary.py | 0 .../adam_core}/coordinates/conversions.py | 0 .../adam_core}/coordinates/covariances.py | 0 .../adam_core}/coordinates/jacobian.py | 0 .../adam_core}/coordinates/keplerian.py | 0 .../adam_core}/coordinates/origin.py | 0 .../adam_core}/coordinates/residuals.py | 0 .../adam_core}/coordinates/spherical.py | 0 .../adam_core}/coordinates/tests/__init__.py | 0 .../adam_core}/coordinates/tests/conftest.py | 0 .../coordinates/tests/test_benchmarks.py | 0 .../coordinates/tests/test_cartesian.py | 0 .../coordinates/tests/test_cometary.py | 0 .../coordinates/tests/test_covariances.py | 0 .../coordinates/tests/test_keplerian.py | 0 .../coordinates/tests/test_origin.py | 0 .../coordinates/tests/test_residuals.py | 0 .../coordinates/tests/test_spherical.py | 0 .../tests/test_transforms_cometary.py | 0 .../tests/test_transforms_keplerian.py | 0 .../tests/test_transforms_rotation.py | 0 .../tests/test_transforms_spherical.py | 0 .../tests/test_transforms_spice.py | 0 .../tests/test_transforms_translation.py | 0 .../adam_core}/coordinates/transform.py | 0 .../adam_core}/coordinates/types.py | 0 .../adam_core}/coordinates/variants.py | 12 +- .../adam_core}/dynamics/__init__.py | 0 .../adam_core}/dynamics/aberrations.py | 0 .../adam_core}/dynamics/barker.py | 0 {adam_core => src/adam_core}/dynamics/chi.py | 0 .../adam_core}/dynamics/ephemeris.py | 0 .../adam_core}/dynamics/impacts.py | 0 .../adam_core}/dynamics/kepler.py | 0 .../adam_core}/dynamics/lagrange.py | 0 {adam_core => src/adam_core}/dynamics/moid.py | 0 .../adam_core}/dynamics/propagation.py | 0 .../adam_core}/dynamics/stumpff.py | 0 .../adam_core}/dynamics/tests/__init__.py | 0 .../adam_core}/dynamics/tests/conftest.py | 0 .../dynamics/tests/test_ephemeris.py | 0 .../adam_core}/dynamics/tests/test_impacts.py | 0 .../adam_core}/dynamics/tests/test_kepler.py | 0 .../adam_core}/dynamics/tests/test_moid.py | 0 .../dynamics/tests/test_propagation.py | 0 .../dynamics/tests/test_tisserand.py | 0 .../adam_core}/dynamics/tisserand.py | 0 .../adam_core}/observations/__init__.py | 0 .../adam_core}/observations/associations.py | 0 .../adam_core}/observations/detections.py | 0 .../adam_core}/observations/exposures.py | 0 .../adam_core}/observations/tests/__init__.py | 0 .../observations/tests/test_associations.py | 0 .../observations/tests/test_detections.py | 0 .../observations/tests/test_exposures.py | 0 .../adam_core}/observers/__init__.py | 0 .../adam_core}/observers/observers.py | 0 .../adam_core}/observers/state.py | 0 .../adam_core}/observers/tests/__init__.py | 0 .../observers/tests/test_benchmarks.py | 0 .../adam_core}/observers/tests/test_state.py | 0 .../observers/tests/testdata/000_ssb.parquet | Bin .../observers/tests/testdata/000_sun.parquet | Bin .../observers/tests/testdata/500_ssb.parquet | Bin .../observers/tests/testdata/500_sun.parquet | Bin .../observers/tests/testdata/F51_ssb.parquet | Bin .../observers/tests/testdata/F51_sun.parquet | Bin .../observers/tests/testdata/I41_ssb.parquet | Bin .../observers/tests/testdata/I41_sun.parquet | Bin .../observers/tests/testdata/README.md | 0 .../observers/tests/testdata/W84_ssb.parquet | Bin .../observers/tests/testdata/W84_sun.parquet | Bin .../observers/tests/testdata/X05_ssb.parquet | Bin .../observers/tests/testdata/X05_sun.parquet | Bin .../observers/tests/testdata/get_states.py | 0 .../orbit_determination/__init__.py | 0 .../differential_correction.py | 0 .../orbit_determination/evaluate.py | 0 .../orbit_determination/fitted_orbits.py | 0 .../orbit_determination/outliers.py | 0 .../orbit_determination/tests/__init__.py | 0 .../orbit_determination/tests/conftest.py | 0 .../tests/data/pure_iod_orbit.parquet | Bin .../tests/data/pure_iod_orbit_members.parquet | Bin .../data/pure_iod_orbit_observations.parquet | Bin .../tests/test_differential_correction.py | 3 +- .../tests/test_evaluate.py | 3 +- .../tests/test_outliers.py | 0 .../adam_core}/orbits/__init__.py | 0 .../adam_core}/orbits/classification.py | 0 .../adam_core}/orbits/ephemeris.py | 0 {adam_core => src/adam_core}/orbits/orbits.py | 0 .../adam_core}/orbits/query/__init__.py | 0 .../adam_core}/orbits/query/horizons.py | 0 .../adam_core}/orbits/query/sbdb.py | 0 .../adam_core}/orbits/query/tests/__init__.py | 0 .../orbits/query/tests/test_sbdb.py | 0 .../query/tests/testdata/sbdb/2001VB.json | 0 .../query/tests/testdata/sbdb/54509.json | 0 .../query/tests/testdata/sbdb/Ceres.json | 0 .../query/tests/testdata/sbdb/README.md | 0 .../query/tests/testdata/sbdb/missing.json | 0 .../adam_core}/orbits/tests/__init__.py | 0 .../orbits/tests/test_benchmarks.py | 0 .../adam_core}/orbits/tests/test_ephemeris.py | 0 .../adam_core}/orbits/tests/test_orbits.py | 0 .../adam_core}/orbits/tests/test_variants.py | 0 .../adam_core}/orbits/variants.py | 0 .../adam_core}/propagator/__init__.py | 0 .../adam_core}/propagator/propagator.py | 0 .../adam_core}/propagator/tests/__init__.py | 0 .../propagator/tests/test_propagator.py | 0 .../adam_core}/propagator/tests/test_utils.py | 0 .../adam_core}/propagator/utils.py | 0 {adam_core => src/adam_core}/ray_cluster.py | 0 .../adam_core}/tests/test_imports.py | 0 .../adam_core}/tests/test_ray_cluster.py | 0 {adam_core => src/adam_core}/time/__init__.py | 0 .../adam_core}/time/tests/__init__.py | 0 .../adam_core}/time/tests/test_time.py | 0 {adam_core => src/adam_core}/time/time.py | 0 .../adam_core}/utils/__init__.py | 0 .../adam_core}/utils/helpers/__init__.py | 0 .../adam_core}/utils/helpers/data/README.md | 0 .../adam_core}/utils/helpers/data/__init__.py | 0 .../utils/helpers/data/elements_ssb_ec.csv | 0 .../utils/helpers/data/elements_ssb_eq.csv | 0 .../utils/helpers/data/elements_sun_ec.csv | 0 .../utils/helpers/data/elements_sun_eq.csv | 0 .../utils/helpers/data/ephemeris.csv | 0 .../utils/helpers/data/get_test_data.py | 0 .../adam_core}/utils/helpers/data/objects.csv | 0 .../utils/helpers/data/orbits.parquet | Bin .../helpers/data/propagated_orbits.parquet | Bin .../adam_core}/utils/helpers/observations.py | 6 +- .../adam_core}/utils/helpers/orbits.py | 0 .../utils/helpers/tests/__init__.py | 0 .../utils/helpers/tests/test_observations.py | 0 .../utils/helpers/tests/test_orbits.py | 0 {adam_core => src/adam_core}/utils/mpc.py | 0 {adam_core => src/adam_core}/utils/spice.py | 0 .../adam_core}/utils/tests/__init__.py | 0 .../adam_core}/utils/tests/test_benchmarks.py | 0 .../adam_core}/utils/tests/test_mpc.py | 0 .../adam_core}/utils/tests/test_spice.py | 0 {adam_core => src/adam_core}/version.py | 0 154 files changed, 71 insertions(+), 153 deletions(-) delete mode 100644 .github/workflows/docker-build-lint-test.yml rename {adam_core => src/adam_core}/__init__.py (100%) rename {adam_core => src/adam_core}/__version__.py (100%) rename {adam_core => src/adam_core}/constants.py (100%) rename {adam_core => src/adam_core}/coordinates/__init__.py (100%) rename {adam_core => src/adam_core}/coordinates/cartesian.py (100%) rename {adam_core => src/adam_core}/coordinates/cometary.py (100%) rename {adam_core => src/adam_core}/coordinates/conversions.py (100%) rename {adam_core => src/adam_core}/coordinates/covariances.py (100%) rename {adam_core => src/adam_core}/coordinates/jacobian.py (100%) rename {adam_core => src/adam_core}/coordinates/keplerian.py (100%) rename {adam_core => src/adam_core}/coordinates/origin.py (100%) rename {adam_core => src/adam_core}/coordinates/residuals.py (100%) rename {adam_core => src/adam_core}/coordinates/spherical.py (100%) rename {adam_core => src/adam_core}/coordinates/tests/__init__.py (100%) rename {adam_core => src/adam_core}/coordinates/tests/conftest.py (100%) rename {adam_core => src/adam_core}/coordinates/tests/test_benchmarks.py (100%) rename {adam_core => src/adam_core}/coordinates/tests/test_cartesian.py (100%) rename {adam_core => src/adam_core}/coordinates/tests/test_cometary.py (100%) rename {adam_core => src/adam_core}/coordinates/tests/test_covariances.py (100%) rename {adam_core => src/adam_core}/coordinates/tests/test_keplerian.py (100%) rename {adam_core => src/adam_core}/coordinates/tests/test_origin.py (100%) rename {adam_core => src/adam_core}/coordinates/tests/test_residuals.py (100%) rename {adam_core => src/adam_core}/coordinates/tests/test_spherical.py (100%) rename {adam_core => src/adam_core}/coordinates/tests/test_transforms_cometary.py (100%) rename {adam_core => src/adam_core}/coordinates/tests/test_transforms_keplerian.py (100%) rename {adam_core => src/adam_core}/coordinates/tests/test_transforms_rotation.py (100%) rename {adam_core => src/adam_core}/coordinates/tests/test_transforms_spherical.py (100%) rename {adam_core => src/adam_core}/coordinates/tests/test_transforms_spice.py (100%) rename {adam_core => src/adam_core}/coordinates/tests/test_transforms_translation.py (100%) rename {adam_core => src/adam_core}/coordinates/transform.py (100%) rename {adam_core => src/adam_core}/coordinates/types.py (100%) rename {adam_core => src/adam_core}/coordinates/variants.py (96%) rename {adam_core => src/adam_core}/dynamics/__init__.py (100%) rename {adam_core => src/adam_core}/dynamics/aberrations.py (100%) rename {adam_core => src/adam_core}/dynamics/barker.py (100%) rename {adam_core => src/adam_core}/dynamics/chi.py (100%) rename {adam_core => src/adam_core}/dynamics/ephemeris.py (100%) rename {adam_core => src/adam_core}/dynamics/impacts.py (100%) rename {adam_core => src/adam_core}/dynamics/kepler.py (100%) rename {adam_core => src/adam_core}/dynamics/lagrange.py (100%) rename {adam_core => src/adam_core}/dynamics/moid.py (100%) rename {adam_core => src/adam_core}/dynamics/propagation.py (100%) rename {adam_core => src/adam_core}/dynamics/stumpff.py (100%) rename {adam_core => src/adam_core}/dynamics/tests/__init__.py (100%) rename {adam_core => src/adam_core}/dynamics/tests/conftest.py (100%) rename {adam_core => src/adam_core}/dynamics/tests/test_ephemeris.py (100%) rename {adam_core => src/adam_core}/dynamics/tests/test_impacts.py (100%) rename {adam_core => src/adam_core}/dynamics/tests/test_kepler.py (100%) rename {adam_core => src/adam_core}/dynamics/tests/test_moid.py (100%) rename {adam_core => src/adam_core}/dynamics/tests/test_propagation.py (100%) rename {adam_core => src/adam_core}/dynamics/tests/test_tisserand.py (100%) rename {adam_core => src/adam_core}/dynamics/tisserand.py (100%) rename {adam_core => src/adam_core}/observations/__init__.py (100%) rename {adam_core => src/adam_core}/observations/associations.py (100%) rename {adam_core => src/adam_core}/observations/detections.py (100%) rename {adam_core => src/adam_core}/observations/exposures.py (100%) rename {adam_core => src/adam_core}/observations/tests/__init__.py (100%) rename {adam_core => src/adam_core}/observations/tests/test_associations.py (100%) rename {adam_core => src/adam_core}/observations/tests/test_detections.py (100%) rename {adam_core => src/adam_core}/observations/tests/test_exposures.py (100%) rename {adam_core => src/adam_core}/observers/__init__.py (100%) rename {adam_core => src/adam_core}/observers/observers.py (100%) rename {adam_core => src/adam_core}/observers/state.py (100%) rename {adam_core => src/adam_core}/observers/tests/__init__.py (100%) rename {adam_core => src/adam_core}/observers/tests/test_benchmarks.py (100%) rename {adam_core => src/adam_core}/observers/tests/test_state.py (100%) rename {adam_core => src/adam_core}/observers/tests/testdata/000_ssb.parquet (100%) rename {adam_core => src/adam_core}/observers/tests/testdata/000_sun.parquet (100%) rename {adam_core => src/adam_core}/observers/tests/testdata/500_ssb.parquet (100%) rename {adam_core => src/adam_core}/observers/tests/testdata/500_sun.parquet (100%) rename {adam_core => src/adam_core}/observers/tests/testdata/F51_ssb.parquet (100%) rename {adam_core => src/adam_core}/observers/tests/testdata/F51_sun.parquet (100%) rename {adam_core => src/adam_core}/observers/tests/testdata/I41_ssb.parquet (100%) rename {adam_core => src/adam_core}/observers/tests/testdata/I41_sun.parquet (100%) rename {adam_core => src/adam_core}/observers/tests/testdata/README.md (100%) rename {adam_core => src/adam_core}/observers/tests/testdata/W84_ssb.parquet (100%) rename {adam_core => src/adam_core}/observers/tests/testdata/W84_sun.parquet (100%) rename {adam_core => src/adam_core}/observers/tests/testdata/X05_ssb.parquet (100%) rename {adam_core => src/adam_core}/observers/tests/testdata/X05_sun.parquet (100%) rename {adam_core => src/adam_core}/observers/tests/testdata/get_states.py (100%) rename {adam_core => src/adam_core}/orbit_determination/__init__.py (100%) rename {adam_core => src/adam_core}/orbit_determination/differential_correction.py (100%) rename {adam_core => src/adam_core}/orbit_determination/evaluate.py (100%) rename {adam_core => src/adam_core}/orbit_determination/fitted_orbits.py (100%) rename {adam_core => src/adam_core}/orbit_determination/outliers.py (100%) rename {adam_core => src/adam_core}/orbit_determination/tests/__init__.py (100%) rename {adam_core => src/adam_core}/orbit_determination/tests/conftest.py (100%) rename {adam_core => src/adam_core}/orbit_determination/tests/data/pure_iod_orbit.parquet (100%) rename {adam_core => src/adam_core}/orbit_determination/tests/data/pure_iod_orbit_members.parquet (100%) rename {adam_core => src/adam_core}/orbit_determination/tests/data/pure_iod_orbit_observations.parquet (100%) rename {adam_core => src/adam_core}/orbit_determination/tests/test_differential_correction.py (94%) rename {adam_core => src/adam_core}/orbit_determination/tests/test_evaluate.py (98%) rename {adam_core => src/adam_core}/orbit_determination/tests/test_outliers.py (100%) rename {adam_core => src/adam_core}/orbits/__init__.py (100%) rename {adam_core => src/adam_core}/orbits/classification.py (100%) rename {adam_core => src/adam_core}/orbits/ephemeris.py (100%) rename {adam_core => src/adam_core}/orbits/orbits.py (100%) rename {adam_core => src/adam_core}/orbits/query/__init__.py (100%) rename {adam_core => src/adam_core}/orbits/query/horizons.py (100%) rename {adam_core => src/adam_core}/orbits/query/sbdb.py (100%) rename {adam_core => src/adam_core}/orbits/query/tests/__init__.py (100%) rename {adam_core => src/adam_core}/orbits/query/tests/test_sbdb.py (100%) rename {adam_core => src/adam_core}/orbits/query/tests/testdata/sbdb/2001VB.json (100%) rename {adam_core => src/adam_core}/orbits/query/tests/testdata/sbdb/54509.json (100%) rename {adam_core => src/adam_core}/orbits/query/tests/testdata/sbdb/Ceres.json (100%) rename {adam_core => src/adam_core}/orbits/query/tests/testdata/sbdb/README.md (100%) rename {adam_core => src/adam_core}/orbits/query/tests/testdata/sbdb/missing.json (100%) rename {adam_core => src/adam_core}/orbits/tests/__init__.py (100%) rename {adam_core => src/adam_core}/orbits/tests/test_benchmarks.py (100%) rename {adam_core => src/adam_core}/orbits/tests/test_ephemeris.py (100%) rename {adam_core => src/adam_core}/orbits/tests/test_orbits.py (100%) rename {adam_core => src/adam_core}/orbits/tests/test_variants.py (100%) rename {adam_core => src/adam_core}/orbits/variants.py (100%) rename {adam_core => src/adam_core}/propagator/__init__.py (100%) rename {adam_core => src/adam_core}/propagator/propagator.py (100%) rename {adam_core => src/adam_core}/propagator/tests/__init__.py (100%) rename {adam_core => src/adam_core}/propagator/tests/test_propagator.py (100%) rename {adam_core => src/adam_core}/propagator/tests/test_utils.py (100%) rename {adam_core => src/adam_core}/propagator/utils.py (100%) rename {adam_core => src/adam_core}/ray_cluster.py (100%) rename {adam_core => src/adam_core}/tests/test_imports.py (100%) rename {adam_core => src/adam_core}/tests/test_ray_cluster.py (100%) rename {adam_core => src/adam_core}/time/__init__.py (100%) rename {adam_core => src/adam_core}/time/tests/__init__.py (100%) rename {adam_core => src/adam_core}/time/tests/test_time.py (100%) rename {adam_core => src/adam_core}/time/time.py (100%) rename {adam_core => src/adam_core}/utils/__init__.py (100%) rename {adam_core => src/adam_core}/utils/helpers/__init__.py (100%) rename {adam_core => src/adam_core}/utils/helpers/data/README.md (100%) rename {adam_core => src/adam_core}/utils/helpers/data/__init__.py (100%) rename {adam_core => src/adam_core}/utils/helpers/data/elements_ssb_ec.csv (100%) rename {adam_core => src/adam_core}/utils/helpers/data/elements_ssb_eq.csv (100%) rename {adam_core => src/adam_core}/utils/helpers/data/elements_sun_ec.csv (100%) rename {adam_core => src/adam_core}/utils/helpers/data/elements_sun_eq.csv (100%) rename {adam_core => src/adam_core}/utils/helpers/data/ephemeris.csv (100%) rename {adam_core => src/adam_core}/utils/helpers/data/get_test_data.py (100%) rename {adam_core => src/adam_core}/utils/helpers/data/objects.csv (100%) rename {adam_core => src/adam_core}/utils/helpers/data/orbits.parquet (100%) rename {adam_core => src/adam_core}/utils/helpers/data/propagated_orbits.parquet (100%) rename {adam_core => src/adam_core}/utils/helpers/observations.py (97%) rename {adam_core => src/adam_core}/utils/helpers/orbits.py (100%) rename {adam_core => src/adam_core}/utils/helpers/tests/__init__.py (100%) rename {adam_core => src/adam_core}/utils/helpers/tests/test_observations.py (100%) rename {adam_core => src/adam_core}/utils/helpers/tests/test_orbits.py (100%) rename {adam_core => src/adam_core}/utils/mpc.py (100%) rename {adam_core => src/adam_core}/utils/spice.py (100%) rename {adam_core => src/adam_core}/utils/tests/__init__.py (100%) rename {adam_core => src/adam_core}/utils/tests/test_benchmarks.py (100%) rename {adam_core => src/adam_core}/utils/tests/test_mpc.py (100%) rename {adam_core => src/adam_core}/utils/tests/test_spice.py (100%) rename {adam_core => src/adam_core}/version.py (100%) diff --git a/.github/workflows/docker-build-lint-test.yml b/.github/workflows/docker-build-lint-test.yml deleted file mode 100644 index 914ec5c6..00000000 --- a/.github/workflows/docker-build-lint-test.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: docker - Build Lint and Test - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - build-lint-test: - runs-on: ubuntu-latest - env: - IMAGE_TAG: ${{ github.sha }} - steps: - - name: Checkout git repo - uses: actions/checkout@v3 - - uses: jpribyl/action-docker-layer-caching@v0.1.0 - # Ignore the failure of a step and avoid terminating the job. - continue-on-error: true - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - with: - install: true - - name: Build and Install - run: docker build --load -t adam-core:$IMAGE_TAG . - - name: Lint - run: docker run -i adam-core:$IMAGE_TAG hatch run dev:lint - - name: Test - run: docker run -i adam-core:$IMAGE_TAG hatch run dev:test diff --git a/.github/workflows/pip-build-lint-test-coverage.yml b/.github/workflows/pip-build-lint-test-coverage.yml index 8d053bad..9b137f37 100644 --- a/.github/workflows/pip-build-lint-test-coverage.yml +++ b/.github/workflows/pip-build-lint-test-coverage.yml @@ -30,16 +30,15 @@ jobs: run: | sudo apt-get update -y sudo apt-get install -y gfortran liblapack-dev - - name: Install Hatch + - name: Install Testing Dependencies run: | pip install pip --upgrade - pip install hatch + pip install ".[dev]" - name: Lint - run: hatch run dev:lint - - name: Test, with coverage report - run: hatch run dev:coverage + run: pdm run lint + - name: Test with coverage + run: pdm run coverage - name: Coverage report to coveralls uses: coverallsapp/github-action@v2.0.0 with: - github-token: ${{ secrets.COVERALLS_TOKEN }} path-to-lcov: coverage.xml diff --git a/pyproject.toml b/pyproject.toml index 7742c171..1ab2640c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,94 +1,67 @@ -[build-system] -requires = ["hatchling"] -build-backend = "hatchling.build" - [project] -name = "adam_core" +name = "adam-assist" +version = "0.1.0" +description = 'ADAM Core Propagator class using ASSIST' authors = [ - { name = "Kathleen Kiker", email = "kathleen@b612foundation.org" }, - { name = "Alec Koumjian", email = "alec@b612foundation.org" }, - { name = "Joachim Moeyens", email = "moeyensj@uw.edu" }, - { name = "Spencer Nelson", email = "spencer@b612foundation.org" }, - { name = "Nate Tellis", email = "nate@b612foundation.org" }, + { name = "Alec Koumjian", email = "akoumjian@gmail.com" }, + { name = "Kathleen Kiker" } ] -description = "Core libraries for the ADAM platform" readme = "README.md" -requires-python = ">=3.10" -classifiers = [ - "Programming Language :: Python :: 3", - "License :: OSI Approved :: MIT License", - "Operating System :: OS Independent", -] -dynamic = ["version"] - +keywords = [] +requires-python = ">=3.11,<4.0" dependencies = [ - "astropy", - "astroquery", - "healpy", - "jax", - "jaxlib", - "numpy<1.25", - "pyarrow>=13.0.0", - # "pyoorb@git+https://github.com/B612-Asteroid-Institute/oorb.git@fork", - "pandas", - "ray", - "requests", - "scipy", - "spiceypy", - "quivr@git+https://github.com/moeyensj/quivr@concatenate-empty-attributes", - "mpc-obscodes", - "naif-de440", - "naif-leapseconds", - "naif-eop-high-prec", - "naif-eop-predict", - "naif-eop-historical", - "naif-earth-itrf93", + "adam-core @ git+https://github.com/B612-Asteroid-Institute/adam_core.git@main", + "assist", + "naif-de440", + "numpy", + "ray", + "spiceypy>=6.0.0" ] -[project.urls] -"Homepage" = "https://github.com/b612-asteroid-institute/adam_core" +[build-system] +requires = ["pdm-backend"] +build-backend = "pdm.backend" +[tool.pdm.build] +includes = ["src/adam_core/"] -[tool.hatch.build.targets.sdist] -include = ["/adam_core"] +[tool.pdm.scripts] +check = {composite = ["lint", "typecheck", "test"]} +format = { composite = ["black ./src/adam_core", "isort ./src/adam_core"]} +lint = { composite = ["ruff check ./src/adam_core", "black --check ./src/adam_core", "isort --check-only ./src/adam_core"] } +fix = "ruff ./src/adam_core --fix" +typecheck = "mypy --strict ./src/adam_core" -[tool.hatch.metadata] -# Temporary while pyoorb is referenced via git direct ref -allow-direct-references = true +test = "pytest --benchmark-disable {args}" +doctest = "pytest --doctest-plus --doctest-only" +benchmark = "pytest --benchmark-only" +coverage = "pytest --cov --cov-report xml" -[tool.hatch.version] -path = "adam_core/__version__.py" +[project.urls] +"Documentation" = "https://github.com/unknown/adam-assist#readme" +"Issues" = "https://github.com/unknown/adam-assist/issues" +"Source" = "https://github.com/unknown/adam-assist" -[tool.hatch.envs.dev] -dependencies = [ - "black==22.10.0", - "isort", - "mypy", - "pytest", - "pytest-cov", - "adam-pyoorb@git+https://github.com/B612-Asteroid-Institute/adam-pyoorb.git@master", - "pytest-benchmark", - "pytest-doctestplus", - "pytest-mock", - "pre-commit", - "ruff", - "ipython", -] -[tool.hatch.envs.dev.scripts] -check = ["lint", "typecheck", "test"] -fix = ["ruff ./adam_core --fix"] -lint = [ - "ruff check ./adam_core", - "black --check ./adam_core", - "isort --check-only ./adam_core", +[project.optional-dependencies] +dev = [ + "pdm", + "pytest", + "pytest-cov", + "pytest-benchmark", + "ruff", + "black", + "isort", + "mypy", + "pytest", + "pytest-cov", + "pytest-benchmark", + "pytest-doctestplus", + "pytest-mock", + "ruff", + "ipython", + "adam-pyoorb @ git+https://github.com/B612-Asteroid-Institute/adam-pyoorb.git@main", ] -format = ["black ./adam_core", "isort ./adam_core"] -typecheck = ["mypy --strict ./adam_core"] -test = ["pytest --benchmark-disable ./adam_core {args}"] -doctest = ["pytest --doctest-plus ./adam_core --doctest-only"] -benchmark = ["pytest --benchmark-only ./adam_core {args}"] -coverage = ["pytest ./adam_core --cov --cov-report xml"] [tool.black] line-length = 88 @@ -96,33 +69,10 @@ line-length = 88 [tool.isort] profile = "black" -[tool.ruff] -line-length = 110 -target-version = "py311" -lint.ignore = [] -exclude = ["build"] - -[tool.hatch.envs.docs] -dependencies = [ - "sphinx", - "sphinx-autodoc-typehints", - "sphinx-copybutton", - "sphinx-toolbox", - "quivr-sphinx-autodoc", -] -[project.optional-dependencies] -docs = [ - "sphinx", - "sphinx-autodoc-typehints", - "sphinx-copybutton", - "sphinx-toolbox", - "quivr-sphinx-autodoc", +[tool.pytest.ini_options] +# In order for namespace packages to work during tests, +# we need to import from the installed modules instead of local source +addopts = [ + "--pyargs", "adam_core", ] - -[tool.hatch.envs.docs.scripts] -make-html = ["make -C docs html"] - -clean = ["make -C docs clean"] - -open-html = ["open docs/build/html/index.html"] diff --git a/adam_core/__init__.py b/src/adam_core/__init__.py similarity index 100% rename from adam_core/__init__.py rename to src/adam_core/__init__.py diff --git a/adam_core/__version__.py b/src/adam_core/__version__.py similarity index 100% rename from adam_core/__version__.py rename to src/adam_core/__version__.py diff --git a/adam_core/constants.py b/src/adam_core/constants.py similarity index 100% rename from adam_core/constants.py rename to src/adam_core/constants.py diff --git a/adam_core/coordinates/__init__.py b/src/adam_core/coordinates/__init__.py similarity index 100% rename from adam_core/coordinates/__init__.py rename to src/adam_core/coordinates/__init__.py diff --git a/adam_core/coordinates/cartesian.py b/src/adam_core/coordinates/cartesian.py similarity index 100% rename from adam_core/coordinates/cartesian.py rename to src/adam_core/coordinates/cartesian.py diff --git a/adam_core/coordinates/cometary.py b/src/adam_core/coordinates/cometary.py similarity index 100% rename from adam_core/coordinates/cometary.py rename to src/adam_core/coordinates/cometary.py diff --git a/adam_core/coordinates/conversions.py b/src/adam_core/coordinates/conversions.py similarity index 100% rename from adam_core/coordinates/conversions.py rename to src/adam_core/coordinates/conversions.py diff --git a/adam_core/coordinates/covariances.py b/src/adam_core/coordinates/covariances.py similarity index 100% rename from adam_core/coordinates/covariances.py rename to src/adam_core/coordinates/covariances.py diff --git a/adam_core/coordinates/jacobian.py b/src/adam_core/coordinates/jacobian.py similarity index 100% rename from adam_core/coordinates/jacobian.py rename to src/adam_core/coordinates/jacobian.py diff --git a/adam_core/coordinates/keplerian.py b/src/adam_core/coordinates/keplerian.py similarity index 100% rename from adam_core/coordinates/keplerian.py rename to src/adam_core/coordinates/keplerian.py diff --git a/adam_core/coordinates/origin.py b/src/adam_core/coordinates/origin.py similarity index 100% rename from adam_core/coordinates/origin.py rename to src/adam_core/coordinates/origin.py diff --git a/adam_core/coordinates/residuals.py b/src/adam_core/coordinates/residuals.py similarity index 100% rename from adam_core/coordinates/residuals.py rename to src/adam_core/coordinates/residuals.py diff --git a/adam_core/coordinates/spherical.py b/src/adam_core/coordinates/spherical.py similarity index 100% rename from adam_core/coordinates/spherical.py rename to src/adam_core/coordinates/spherical.py diff --git a/adam_core/coordinates/tests/__init__.py b/src/adam_core/coordinates/tests/__init__.py similarity index 100% rename from adam_core/coordinates/tests/__init__.py rename to src/adam_core/coordinates/tests/__init__.py diff --git a/adam_core/coordinates/tests/conftest.py b/src/adam_core/coordinates/tests/conftest.py similarity index 100% rename from adam_core/coordinates/tests/conftest.py rename to src/adam_core/coordinates/tests/conftest.py diff --git a/adam_core/coordinates/tests/test_benchmarks.py b/src/adam_core/coordinates/tests/test_benchmarks.py similarity index 100% rename from adam_core/coordinates/tests/test_benchmarks.py rename to src/adam_core/coordinates/tests/test_benchmarks.py diff --git a/adam_core/coordinates/tests/test_cartesian.py b/src/adam_core/coordinates/tests/test_cartesian.py similarity index 100% rename from adam_core/coordinates/tests/test_cartesian.py rename to src/adam_core/coordinates/tests/test_cartesian.py diff --git a/adam_core/coordinates/tests/test_cometary.py b/src/adam_core/coordinates/tests/test_cometary.py similarity index 100% rename from adam_core/coordinates/tests/test_cometary.py rename to src/adam_core/coordinates/tests/test_cometary.py diff --git a/adam_core/coordinates/tests/test_covariances.py b/src/adam_core/coordinates/tests/test_covariances.py similarity index 100% rename from adam_core/coordinates/tests/test_covariances.py rename to src/adam_core/coordinates/tests/test_covariances.py diff --git a/adam_core/coordinates/tests/test_keplerian.py b/src/adam_core/coordinates/tests/test_keplerian.py similarity index 100% rename from adam_core/coordinates/tests/test_keplerian.py rename to src/adam_core/coordinates/tests/test_keplerian.py diff --git a/adam_core/coordinates/tests/test_origin.py b/src/adam_core/coordinates/tests/test_origin.py similarity index 100% rename from adam_core/coordinates/tests/test_origin.py rename to src/adam_core/coordinates/tests/test_origin.py diff --git a/adam_core/coordinates/tests/test_residuals.py b/src/adam_core/coordinates/tests/test_residuals.py similarity index 100% rename from adam_core/coordinates/tests/test_residuals.py rename to src/adam_core/coordinates/tests/test_residuals.py diff --git a/adam_core/coordinates/tests/test_spherical.py b/src/adam_core/coordinates/tests/test_spherical.py similarity index 100% rename from adam_core/coordinates/tests/test_spherical.py rename to src/adam_core/coordinates/tests/test_spherical.py diff --git a/adam_core/coordinates/tests/test_transforms_cometary.py b/src/adam_core/coordinates/tests/test_transforms_cometary.py similarity index 100% rename from adam_core/coordinates/tests/test_transforms_cometary.py rename to src/adam_core/coordinates/tests/test_transforms_cometary.py diff --git a/adam_core/coordinates/tests/test_transforms_keplerian.py b/src/adam_core/coordinates/tests/test_transforms_keplerian.py similarity index 100% rename from adam_core/coordinates/tests/test_transforms_keplerian.py rename to src/adam_core/coordinates/tests/test_transforms_keplerian.py diff --git a/adam_core/coordinates/tests/test_transforms_rotation.py b/src/adam_core/coordinates/tests/test_transforms_rotation.py similarity index 100% rename from adam_core/coordinates/tests/test_transforms_rotation.py rename to src/adam_core/coordinates/tests/test_transforms_rotation.py diff --git a/adam_core/coordinates/tests/test_transforms_spherical.py b/src/adam_core/coordinates/tests/test_transforms_spherical.py similarity index 100% rename from adam_core/coordinates/tests/test_transforms_spherical.py rename to src/adam_core/coordinates/tests/test_transforms_spherical.py diff --git a/adam_core/coordinates/tests/test_transforms_spice.py b/src/adam_core/coordinates/tests/test_transforms_spice.py similarity index 100% rename from adam_core/coordinates/tests/test_transforms_spice.py rename to src/adam_core/coordinates/tests/test_transforms_spice.py diff --git a/adam_core/coordinates/tests/test_transforms_translation.py b/src/adam_core/coordinates/tests/test_transforms_translation.py similarity index 100% rename from adam_core/coordinates/tests/test_transforms_translation.py rename to src/adam_core/coordinates/tests/test_transforms_translation.py diff --git a/adam_core/coordinates/transform.py b/src/adam_core/coordinates/transform.py similarity index 100% rename from adam_core/coordinates/transform.py rename to src/adam_core/coordinates/transform.py diff --git a/adam_core/coordinates/types.py b/src/adam_core/coordinates/types.py similarity index 100% rename from adam_core/coordinates/types.py rename to src/adam_core/coordinates/types.py diff --git a/adam_core/coordinates/variants.py b/src/adam_core/coordinates/variants.py similarity index 96% rename from adam_core/coordinates/variants.py rename to src/adam_core/coordinates/variants.py index 49091f51..1461e744 100644 --- a/adam_core/coordinates/variants.py +++ b/src/adam_core/coordinates/variants.py @@ -27,20 +27,16 @@ class VariantCoordinatesTable(Generic[T], Protocol): """ @property - def index(self) -> pa.Int64Array: - ... + def index(self) -> pa.Int64Array: ... @property - def sample(self) -> T: - ... + def sample(self) -> T: ... @property - def weight(self) -> pa.lib.DoubleArray: - ... + def weight(self) -> pa.lib.DoubleArray: ... @property - def weight_cov(self) -> pa.lib.DoubleArray: - ... + def weight_cov(self) -> pa.lib.DoubleArray: ... def create_coordinate_variants( diff --git a/adam_core/dynamics/__init__.py b/src/adam_core/dynamics/__init__.py similarity index 100% rename from adam_core/dynamics/__init__.py rename to src/adam_core/dynamics/__init__.py diff --git a/adam_core/dynamics/aberrations.py b/src/adam_core/dynamics/aberrations.py similarity index 100% rename from adam_core/dynamics/aberrations.py rename to src/adam_core/dynamics/aberrations.py diff --git a/adam_core/dynamics/barker.py b/src/adam_core/dynamics/barker.py similarity index 100% rename from adam_core/dynamics/barker.py rename to src/adam_core/dynamics/barker.py diff --git a/adam_core/dynamics/chi.py b/src/adam_core/dynamics/chi.py similarity index 100% rename from adam_core/dynamics/chi.py rename to src/adam_core/dynamics/chi.py diff --git a/adam_core/dynamics/ephemeris.py b/src/adam_core/dynamics/ephemeris.py similarity index 100% rename from adam_core/dynamics/ephemeris.py rename to src/adam_core/dynamics/ephemeris.py diff --git a/adam_core/dynamics/impacts.py b/src/adam_core/dynamics/impacts.py similarity index 100% rename from adam_core/dynamics/impacts.py rename to src/adam_core/dynamics/impacts.py diff --git a/adam_core/dynamics/kepler.py b/src/adam_core/dynamics/kepler.py similarity index 100% rename from adam_core/dynamics/kepler.py rename to src/adam_core/dynamics/kepler.py diff --git a/adam_core/dynamics/lagrange.py b/src/adam_core/dynamics/lagrange.py similarity index 100% rename from adam_core/dynamics/lagrange.py rename to src/adam_core/dynamics/lagrange.py diff --git a/adam_core/dynamics/moid.py b/src/adam_core/dynamics/moid.py similarity index 100% rename from adam_core/dynamics/moid.py rename to src/adam_core/dynamics/moid.py diff --git a/adam_core/dynamics/propagation.py b/src/adam_core/dynamics/propagation.py similarity index 100% rename from adam_core/dynamics/propagation.py rename to src/adam_core/dynamics/propagation.py diff --git a/adam_core/dynamics/stumpff.py b/src/adam_core/dynamics/stumpff.py similarity index 100% rename from adam_core/dynamics/stumpff.py rename to src/adam_core/dynamics/stumpff.py diff --git a/adam_core/dynamics/tests/__init__.py b/src/adam_core/dynamics/tests/__init__.py similarity index 100% rename from adam_core/dynamics/tests/__init__.py rename to src/adam_core/dynamics/tests/__init__.py diff --git a/adam_core/dynamics/tests/conftest.py b/src/adam_core/dynamics/tests/conftest.py similarity index 100% rename from adam_core/dynamics/tests/conftest.py rename to src/adam_core/dynamics/tests/conftest.py diff --git a/adam_core/dynamics/tests/test_ephemeris.py b/src/adam_core/dynamics/tests/test_ephemeris.py similarity index 100% rename from adam_core/dynamics/tests/test_ephemeris.py rename to src/adam_core/dynamics/tests/test_ephemeris.py diff --git a/adam_core/dynamics/tests/test_impacts.py b/src/adam_core/dynamics/tests/test_impacts.py similarity index 100% rename from adam_core/dynamics/tests/test_impacts.py rename to src/adam_core/dynamics/tests/test_impacts.py diff --git a/adam_core/dynamics/tests/test_kepler.py b/src/adam_core/dynamics/tests/test_kepler.py similarity index 100% rename from adam_core/dynamics/tests/test_kepler.py rename to src/adam_core/dynamics/tests/test_kepler.py diff --git a/adam_core/dynamics/tests/test_moid.py b/src/adam_core/dynamics/tests/test_moid.py similarity index 100% rename from adam_core/dynamics/tests/test_moid.py rename to src/adam_core/dynamics/tests/test_moid.py diff --git a/adam_core/dynamics/tests/test_propagation.py b/src/adam_core/dynamics/tests/test_propagation.py similarity index 100% rename from adam_core/dynamics/tests/test_propagation.py rename to src/adam_core/dynamics/tests/test_propagation.py diff --git a/adam_core/dynamics/tests/test_tisserand.py b/src/adam_core/dynamics/tests/test_tisserand.py similarity index 100% rename from adam_core/dynamics/tests/test_tisserand.py rename to src/adam_core/dynamics/tests/test_tisserand.py diff --git a/adam_core/dynamics/tisserand.py b/src/adam_core/dynamics/tisserand.py similarity index 100% rename from adam_core/dynamics/tisserand.py rename to src/adam_core/dynamics/tisserand.py diff --git a/adam_core/observations/__init__.py b/src/adam_core/observations/__init__.py similarity index 100% rename from adam_core/observations/__init__.py rename to src/adam_core/observations/__init__.py diff --git a/adam_core/observations/associations.py b/src/adam_core/observations/associations.py similarity index 100% rename from adam_core/observations/associations.py rename to src/adam_core/observations/associations.py diff --git a/adam_core/observations/detections.py b/src/adam_core/observations/detections.py similarity index 100% rename from adam_core/observations/detections.py rename to src/adam_core/observations/detections.py diff --git a/adam_core/observations/exposures.py b/src/adam_core/observations/exposures.py similarity index 100% rename from adam_core/observations/exposures.py rename to src/adam_core/observations/exposures.py diff --git a/adam_core/observations/tests/__init__.py b/src/adam_core/observations/tests/__init__.py similarity index 100% rename from adam_core/observations/tests/__init__.py rename to src/adam_core/observations/tests/__init__.py diff --git a/adam_core/observations/tests/test_associations.py b/src/adam_core/observations/tests/test_associations.py similarity index 100% rename from adam_core/observations/tests/test_associations.py rename to src/adam_core/observations/tests/test_associations.py diff --git a/adam_core/observations/tests/test_detections.py b/src/adam_core/observations/tests/test_detections.py similarity index 100% rename from adam_core/observations/tests/test_detections.py rename to src/adam_core/observations/tests/test_detections.py diff --git a/adam_core/observations/tests/test_exposures.py b/src/adam_core/observations/tests/test_exposures.py similarity index 100% rename from adam_core/observations/tests/test_exposures.py rename to src/adam_core/observations/tests/test_exposures.py diff --git a/adam_core/observers/__init__.py b/src/adam_core/observers/__init__.py similarity index 100% rename from adam_core/observers/__init__.py rename to src/adam_core/observers/__init__.py diff --git a/adam_core/observers/observers.py b/src/adam_core/observers/observers.py similarity index 100% rename from adam_core/observers/observers.py rename to src/adam_core/observers/observers.py diff --git a/adam_core/observers/state.py b/src/adam_core/observers/state.py similarity index 100% rename from adam_core/observers/state.py rename to src/adam_core/observers/state.py diff --git a/adam_core/observers/tests/__init__.py b/src/adam_core/observers/tests/__init__.py similarity index 100% rename from adam_core/observers/tests/__init__.py rename to src/adam_core/observers/tests/__init__.py diff --git a/adam_core/observers/tests/test_benchmarks.py b/src/adam_core/observers/tests/test_benchmarks.py similarity index 100% rename from adam_core/observers/tests/test_benchmarks.py rename to src/adam_core/observers/tests/test_benchmarks.py diff --git a/adam_core/observers/tests/test_state.py b/src/adam_core/observers/tests/test_state.py similarity index 100% rename from adam_core/observers/tests/test_state.py rename to src/adam_core/observers/tests/test_state.py diff --git a/adam_core/observers/tests/testdata/000_ssb.parquet b/src/adam_core/observers/tests/testdata/000_ssb.parquet similarity index 100% rename from adam_core/observers/tests/testdata/000_ssb.parquet rename to src/adam_core/observers/tests/testdata/000_ssb.parquet diff --git a/adam_core/observers/tests/testdata/000_sun.parquet b/src/adam_core/observers/tests/testdata/000_sun.parquet similarity index 100% rename from adam_core/observers/tests/testdata/000_sun.parquet rename to src/adam_core/observers/tests/testdata/000_sun.parquet diff --git a/adam_core/observers/tests/testdata/500_ssb.parquet b/src/adam_core/observers/tests/testdata/500_ssb.parquet similarity index 100% rename from adam_core/observers/tests/testdata/500_ssb.parquet rename to src/adam_core/observers/tests/testdata/500_ssb.parquet diff --git a/adam_core/observers/tests/testdata/500_sun.parquet b/src/adam_core/observers/tests/testdata/500_sun.parquet similarity index 100% rename from adam_core/observers/tests/testdata/500_sun.parquet rename to src/adam_core/observers/tests/testdata/500_sun.parquet diff --git a/adam_core/observers/tests/testdata/F51_ssb.parquet b/src/adam_core/observers/tests/testdata/F51_ssb.parquet similarity index 100% rename from adam_core/observers/tests/testdata/F51_ssb.parquet rename to src/adam_core/observers/tests/testdata/F51_ssb.parquet diff --git a/adam_core/observers/tests/testdata/F51_sun.parquet b/src/adam_core/observers/tests/testdata/F51_sun.parquet similarity index 100% rename from adam_core/observers/tests/testdata/F51_sun.parquet rename to src/adam_core/observers/tests/testdata/F51_sun.parquet diff --git a/adam_core/observers/tests/testdata/I41_ssb.parquet b/src/adam_core/observers/tests/testdata/I41_ssb.parquet similarity index 100% rename from adam_core/observers/tests/testdata/I41_ssb.parquet rename to src/adam_core/observers/tests/testdata/I41_ssb.parquet diff --git a/adam_core/observers/tests/testdata/I41_sun.parquet b/src/adam_core/observers/tests/testdata/I41_sun.parquet similarity index 100% rename from adam_core/observers/tests/testdata/I41_sun.parquet rename to src/adam_core/observers/tests/testdata/I41_sun.parquet diff --git a/adam_core/observers/tests/testdata/README.md b/src/adam_core/observers/tests/testdata/README.md similarity index 100% rename from adam_core/observers/tests/testdata/README.md rename to src/adam_core/observers/tests/testdata/README.md diff --git a/adam_core/observers/tests/testdata/W84_ssb.parquet b/src/adam_core/observers/tests/testdata/W84_ssb.parquet similarity index 100% rename from adam_core/observers/tests/testdata/W84_ssb.parquet rename to src/adam_core/observers/tests/testdata/W84_ssb.parquet diff --git a/adam_core/observers/tests/testdata/W84_sun.parquet b/src/adam_core/observers/tests/testdata/W84_sun.parquet similarity index 100% rename from adam_core/observers/tests/testdata/W84_sun.parquet rename to src/adam_core/observers/tests/testdata/W84_sun.parquet diff --git a/adam_core/observers/tests/testdata/X05_ssb.parquet b/src/adam_core/observers/tests/testdata/X05_ssb.parquet similarity index 100% rename from adam_core/observers/tests/testdata/X05_ssb.parquet rename to src/adam_core/observers/tests/testdata/X05_ssb.parquet diff --git a/adam_core/observers/tests/testdata/X05_sun.parquet b/src/adam_core/observers/tests/testdata/X05_sun.parquet similarity index 100% rename from adam_core/observers/tests/testdata/X05_sun.parquet rename to src/adam_core/observers/tests/testdata/X05_sun.parquet diff --git a/adam_core/observers/tests/testdata/get_states.py b/src/adam_core/observers/tests/testdata/get_states.py similarity index 100% rename from adam_core/observers/tests/testdata/get_states.py rename to src/adam_core/observers/tests/testdata/get_states.py diff --git a/adam_core/orbit_determination/__init__.py b/src/adam_core/orbit_determination/__init__.py similarity index 100% rename from adam_core/orbit_determination/__init__.py rename to src/adam_core/orbit_determination/__init__.py diff --git a/adam_core/orbit_determination/differential_correction.py b/src/adam_core/orbit_determination/differential_correction.py similarity index 100% rename from adam_core/orbit_determination/differential_correction.py rename to src/adam_core/orbit_determination/differential_correction.py diff --git a/adam_core/orbit_determination/evaluate.py b/src/adam_core/orbit_determination/evaluate.py similarity index 100% rename from adam_core/orbit_determination/evaluate.py rename to src/adam_core/orbit_determination/evaluate.py diff --git a/adam_core/orbit_determination/fitted_orbits.py b/src/adam_core/orbit_determination/fitted_orbits.py similarity index 100% rename from adam_core/orbit_determination/fitted_orbits.py rename to src/adam_core/orbit_determination/fitted_orbits.py diff --git a/adam_core/orbit_determination/outliers.py b/src/adam_core/orbit_determination/outliers.py similarity index 100% rename from adam_core/orbit_determination/outliers.py rename to src/adam_core/orbit_determination/outliers.py diff --git a/adam_core/orbit_determination/tests/__init__.py b/src/adam_core/orbit_determination/tests/__init__.py similarity index 100% rename from adam_core/orbit_determination/tests/__init__.py rename to src/adam_core/orbit_determination/tests/__init__.py diff --git a/adam_core/orbit_determination/tests/conftest.py b/src/adam_core/orbit_determination/tests/conftest.py similarity index 100% rename from adam_core/orbit_determination/tests/conftest.py rename to src/adam_core/orbit_determination/tests/conftest.py diff --git a/adam_core/orbit_determination/tests/data/pure_iod_orbit.parquet b/src/adam_core/orbit_determination/tests/data/pure_iod_orbit.parquet similarity index 100% rename from adam_core/orbit_determination/tests/data/pure_iod_orbit.parquet rename to src/adam_core/orbit_determination/tests/data/pure_iod_orbit.parquet diff --git a/adam_core/orbit_determination/tests/data/pure_iod_orbit_members.parquet b/src/adam_core/orbit_determination/tests/data/pure_iod_orbit_members.parquet similarity index 100% rename from adam_core/orbit_determination/tests/data/pure_iod_orbit_members.parquet rename to src/adam_core/orbit_determination/tests/data/pure_iod_orbit_members.parquet diff --git a/adam_core/orbit_determination/tests/data/pure_iod_orbit_observations.parquet b/src/adam_core/orbit_determination/tests/data/pure_iod_orbit_observations.parquet similarity index 100% rename from adam_core/orbit_determination/tests/data/pure_iod_orbit_observations.parquet rename to src/adam_core/orbit_determination/tests/data/pure_iod_orbit_observations.parquet diff --git a/adam_core/orbit_determination/tests/test_differential_correction.py b/src/adam_core/orbit_determination/tests/test_differential_correction.py similarity index 94% rename from adam_core/orbit_determination/tests/test_differential_correction.py rename to src/adam_core/orbit_determination/tests/test_differential_correction.py index fd08e769..3281aa34 100644 --- a/adam_core/orbit_determination/tests/test_differential_correction.py +++ b/src/adam_core/orbit_determination/tests/test_differential_correction.py @@ -2,7 +2,8 @@ import pytest -from ...propagator.pyoorb import PYOORB +from adam_core.propagator.adam_pyoorb import PYOORB + from ..differential_correction import fit_least_squares diff --git a/adam_core/orbit_determination/tests/test_evaluate.py b/src/adam_core/orbit_determination/tests/test_evaluate.py similarity index 98% rename from adam_core/orbit_determination/tests/test_evaluate.py rename to src/adam_core/orbit_determination/tests/test_evaluate.py index 7c193ecd..91257024 100644 --- a/adam_core/orbit_determination/tests/test_evaluate.py +++ b/src/adam_core/orbit_determination/tests/test_evaluate.py @@ -5,7 +5,8 @@ import pytest import quivr as qv -from ...propagator.pyoorb import PYOORB +from adam_core.propagator.adam_pyoorb import PYOORB + from ..evaluate import evaluate_orbits diff --git a/adam_core/orbit_determination/tests/test_outliers.py b/src/adam_core/orbit_determination/tests/test_outliers.py similarity index 100% rename from adam_core/orbit_determination/tests/test_outliers.py rename to src/adam_core/orbit_determination/tests/test_outliers.py diff --git a/adam_core/orbits/__init__.py b/src/adam_core/orbits/__init__.py similarity index 100% rename from adam_core/orbits/__init__.py rename to src/adam_core/orbits/__init__.py diff --git a/adam_core/orbits/classification.py b/src/adam_core/orbits/classification.py similarity index 100% rename from adam_core/orbits/classification.py rename to src/adam_core/orbits/classification.py diff --git a/adam_core/orbits/ephemeris.py b/src/adam_core/orbits/ephemeris.py similarity index 100% rename from adam_core/orbits/ephemeris.py rename to src/adam_core/orbits/ephemeris.py diff --git a/adam_core/orbits/orbits.py b/src/adam_core/orbits/orbits.py similarity index 100% rename from adam_core/orbits/orbits.py rename to src/adam_core/orbits/orbits.py diff --git a/adam_core/orbits/query/__init__.py b/src/adam_core/orbits/query/__init__.py similarity index 100% rename from adam_core/orbits/query/__init__.py rename to src/adam_core/orbits/query/__init__.py diff --git a/adam_core/orbits/query/horizons.py b/src/adam_core/orbits/query/horizons.py similarity index 100% rename from adam_core/orbits/query/horizons.py rename to src/adam_core/orbits/query/horizons.py diff --git a/adam_core/orbits/query/sbdb.py b/src/adam_core/orbits/query/sbdb.py similarity index 100% rename from adam_core/orbits/query/sbdb.py rename to src/adam_core/orbits/query/sbdb.py diff --git a/adam_core/orbits/query/tests/__init__.py b/src/adam_core/orbits/query/tests/__init__.py similarity index 100% rename from adam_core/orbits/query/tests/__init__.py rename to src/adam_core/orbits/query/tests/__init__.py diff --git a/adam_core/orbits/query/tests/test_sbdb.py b/src/adam_core/orbits/query/tests/test_sbdb.py similarity index 100% rename from adam_core/orbits/query/tests/test_sbdb.py rename to src/adam_core/orbits/query/tests/test_sbdb.py diff --git a/adam_core/orbits/query/tests/testdata/sbdb/2001VB.json b/src/adam_core/orbits/query/tests/testdata/sbdb/2001VB.json similarity index 100% rename from adam_core/orbits/query/tests/testdata/sbdb/2001VB.json rename to src/adam_core/orbits/query/tests/testdata/sbdb/2001VB.json diff --git a/adam_core/orbits/query/tests/testdata/sbdb/54509.json b/src/adam_core/orbits/query/tests/testdata/sbdb/54509.json similarity index 100% rename from adam_core/orbits/query/tests/testdata/sbdb/54509.json rename to src/adam_core/orbits/query/tests/testdata/sbdb/54509.json diff --git a/adam_core/orbits/query/tests/testdata/sbdb/Ceres.json b/src/adam_core/orbits/query/tests/testdata/sbdb/Ceres.json similarity index 100% rename from adam_core/orbits/query/tests/testdata/sbdb/Ceres.json rename to src/adam_core/orbits/query/tests/testdata/sbdb/Ceres.json diff --git a/adam_core/orbits/query/tests/testdata/sbdb/README.md b/src/adam_core/orbits/query/tests/testdata/sbdb/README.md similarity index 100% rename from adam_core/orbits/query/tests/testdata/sbdb/README.md rename to src/adam_core/orbits/query/tests/testdata/sbdb/README.md diff --git a/adam_core/orbits/query/tests/testdata/sbdb/missing.json b/src/adam_core/orbits/query/tests/testdata/sbdb/missing.json similarity index 100% rename from adam_core/orbits/query/tests/testdata/sbdb/missing.json rename to src/adam_core/orbits/query/tests/testdata/sbdb/missing.json diff --git a/adam_core/orbits/tests/__init__.py b/src/adam_core/orbits/tests/__init__.py similarity index 100% rename from adam_core/orbits/tests/__init__.py rename to src/adam_core/orbits/tests/__init__.py diff --git a/adam_core/orbits/tests/test_benchmarks.py b/src/adam_core/orbits/tests/test_benchmarks.py similarity index 100% rename from adam_core/orbits/tests/test_benchmarks.py rename to src/adam_core/orbits/tests/test_benchmarks.py diff --git a/adam_core/orbits/tests/test_ephemeris.py b/src/adam_core/orbits/tests/test_ephemeris.py similarity index 100% rename from adam_core/orbits/tests/test_ephemeris.py rename to src/adam_core/orbits/tests/test_ephemeris.py diff --git a/adam_core/orbits/tests/test_orbits.py b/src/adam_core/orbits/tests/test_orbits.py similarity index 100% rename from adam_core/orbits/tests/test_orbits.py rename to src/adam_core/orbits/tests/test_orbits.py diff --git a/adam_core/orbits/tests/test_variants.py b/src/adam_core/orbits/tests/test_variants.py similarity index 100% rename from adam_core/orbits/tests/test_variants.py rename to src/adam_core/orbits/tests/test_variants.py diff --git a/adam_core/orbits/variants.py b/src/adam_core/orbits/variants.py similarity index 100% rename from adam_core/orbits/variants.py rename to src/adam_core/orbits/variants.py diff --git a/adam_core/propagator/__init__.py b/src/adam_core/propagator/__init__.py similarity index 100% rename from adam_core/propagator/__init__.py rename to src/adam_core/propagator/__init__.py diff --git a/adam_core/propagator/propagator.py b/src/adam_core/propagator/propagator.py similarity index 100% rename from adam_core/propagator/propagator.py rename to src/adam_core/propagator/propagator.py diff --git a/adam_core/propagator/tests/__init__.py b/src/adam_core/propagator/tests/__init__.py similarity index 100% rename from adam_core/propagator/tests/__init__.py rename to src/adam_core/propagator/tests/__init__.py diff --git a/adam_core/propagator/tests/test_propagator.py b/src/adam_core/propagator/tests/test_propagator.py similarity index 100% rename from adam_core/propagator/tests/test_propagator.py rename to src/adam_core/propagator/tests/test_propagator.py diff --git a/adam_core/propagator/tests/test_utils.py b/src/adam_core/propagator/tests/test_utils.py similarity index 100% rename from adam_core/propagator/tests/test_utils.py rename to src/adam_core/propagator/tests/test_utils.py diff --git a/adam_core/propagator/utils.py b/src/adam_core/propagator/utils.py similarity index 100% rename from adam_core/propagator/utils.py rename to src/adam_core/propagator/utils.py diff --git a/adam_core/ray_cluster.py b/src/adam_core/ray_cluster.py similarity index 100% rename from adam_core/ray_cluster.py rename to src/adam_core/ray_cluster.py diff --git a/adam_core/tests/test_imports.py b/src/adam_core/tests/test_imports.py similarity index 100% rename from adam_core/tests/test_imports.py rename to src/adam_core/tests/test_imports.py diff --git a/adam_core/tests/test_ray_cluster.py b/src/adam_core/tests/test_ray_cluster.py similarity index 100% rename from adam_core/tests/test_ray_cluster.py rename to src/adam_core/tests/test_ray_cluster.py diff --git a/adam_core/time/__init__.py b/src/adam_core/time/__init__.py similarity index 100% rename from adam_core/time/__init__.py rename to src/adam_core/time/__init__.py diff --git a/adam_core/time/tests/__init__.py b/src/adam_core/time/tests/__init__.py similarity index 100% rename from adam_core/time/tests/__init__.py rename to src/adam_core/time/tests/__init__.py diff --git a/adam_core/time/tests/test_time.py b/src/adam_core/time/tests/test_time.py similarity index 100% rename from adam_core/time/tests/test_time.py rename to src/adam_core/time/tests/test_time.py diff --git a/adam_core/time/time.py b/src/adam_core/time/time.py similarity index 100% rename from adam_core/time/time.py rename to src/adam_core/time/time.py diff --git a/adam_core/utils/__init__.py b/src/adam_core/utils/__init__.py similarity index 100% rename from adam_core/utils/__init__.py rename to src/adam_core/utils/__init__.py diff --git a/adam_core/utils/helpers/__init__.py b/src/adam_core/utils/helpers/__init__.py similarity index 100% rename from adam_core/utils/helpers/__init__.py rename to src/adam_core/utils/helpers/__init__.py diff --git a/adam_core/utils/helpers/data/README.md b/src/adam_core/utils/helpers/data/README.md similarity index 100% rename from adam_core/utils/helpers/data/README.md rename to src/adam_core/utils/helpers/data/README.md diff --git a/adam_core/utils/helpers/data/__init__.py b/src/adam_core/utils/helpers/data/__init__.py similarity index 100% rename from adam_core/utils/helpers/data/__init__.py rename to src/adam_core/utils/helpers/data/__init__.py diff --git a/adam_core/utils/helpers/data/elements_ssb_ec.csv b/src/adam_core/utils/helpers/data/elements_ssb_ec.csv similarity index 100% rename from adam_core/utils/helpers/data/elements_ssb_ec.csv rename to src/adam_core/utils/helpers/data/elements_ssb_ec.csv diff --git a/adam_core/utils/helpers/data/elements_ssb_eq.csv b/src/adam_core/utils/helpers/data/elements_ssb_eq.csv similarity index 100% rename from adam_core/utils/helpers/data/elements_ssb_eq.csv rename to src/adam_core/utils/helpers/data/elements_ssb_eq.csv diff --git a/adam_core/utils/helpers/data/elements_sun_ec.csv b/src/adam_core/utils/helpers/data/elements_sun_ec.csv similarity index 100% rename from adam_core/utils/helpers/data/elements_sun_ec.csv rename to src/adam_core/utils/helpers/data/elements_sun_ec.csv diff --git a/adam_core/utils/helpers/data/elements_sun_eq.csv b/src/adam_core/utils/helpers/data/elements_sun_eq.csv similarity index 100% rename from adam_core/utils/helpers/data/elements_sun_eq.csv rename to src/adam_core/utils/helpers/data/elements_sun_eq.csv diff --git a/adam_core/utils/helpers/data/ephemeris.csv b/src/adam_core/utils/helpers/data/ephemeris.csv similarity index 100% rename from adam_core/utils/helpers/data/ephemeris.csv rename to src/adam_core/utils/helpers/data/ephemeris.csv diff --git a/adam_core/utils/helpers/data/get_test_data.py b/src/adam_core/utils/helpers/data/get_test_data.py similarity index 100% rename from adam_core/utils/helpers/data/get_test_data.py rename to src/adam_core/utils/helpers/data/get_test_data.py diff --git a/adam_core/utils/helpers/data/objects.csv b/src/adam_core/utils/helpers/data/objects.csv similarity index 100% rename from adam_core/utils/helpers/data/objects.csv rename to src/adam_core/utils/helpers/data/objects.csv diff --git a/adam_core/utils/helpers/data/orbits.parquet b/src/adam_core/utils/helpers/data/orbits.parquet similarity index 100% rename from adam_core/utils/helpers/data/orbits.parquet rename to src/adam_core/utils/helpers/data/orbits.parquet diff --git a/adam_core/utils/helpers/data/propagated_orbits.parquet b/src/adam_core/utils/helpers/data/propagated_orbits.parquet similarity index 100% rename from adam_core/utils/helpers/data/propagated_orbits.parquet rename to src/adam_core/utils/helpers/data/propagated_orbits.parquet diff --git a/adam_core/utils/helpers/observations.py b/src/adam_core/utils/helpers/observations.py similarity index 97% rename from adam_core/utils/helpers/observations.py rename to src/adam_core/utils/helpers/observations.py index d28fed25..18bd24e4 100644 --- a/adam_core/utils/helpers/observations.py +++ b/src/adam_core/utils/helpers/observations.py @@ -72,9 +72,9 @@ def make_observations() -> Tuple[Exposures, PointSourceDetections, Associations] + [f"{i:04d}" for i in range(len(exposures))], ) for observatory_code in exposures["observatory_code"].unique(): - exposures.loc[ - exposures["observatory_code"] == observatory_code, "duration" - ] = exposure_times[observatory_code] + exposures.loc[exposures["observatory_code"] == observatory_code, "duration"] = ( + exposure_times[observatory_code] + ) exposures["filter"] = "V" # Attached exposure IDs to the ephemerides diff --git a/adam_core/utils/helpers/orbits.py b/src/adam_core/utils/helpers/orbits.py similarity index 100% rename from adam_core/utils/helpers/orbits.py rename to src/adam_core/utils/helpers/orbits.py diff --git a/adam_core/utils/helpers/tests/__init__.py b/src/adam_core/utils/helpers/tests/__init__.py similarity index 100% rename from adam_core/utils/helpers/tests/__init__.py rename to src/adam_core/utils/helpers/tests/__init__.py diff --git a/adam_core/utils/helpers/tests/test_observations.py b/src/adam_core/utils/helpers/tests/test_observations.py similarity index 100% rename from adam_core/utils/helpers/tests/test_observations.py rename to src/adam_core/utils/helpers/tests/test_observations.py diff --git a/adam_core/utils/helpers/tests/test_orbits.py b/src/adam_core/utils/helpers/tests/test_orbits.py similarity index 100% rename from adam_core/utils/helpers/tests/test_orbits.py rename to src/adam_core/utils/helpers/tests/test_orbits.py diff --git a/adam_core/utils/mpc.py b/src/adam_core/utils/mpc.py similarity index 100% rename from adam_core/utils/mpc.py rename to src/adam_core/utils/mpc.py diff --git a/adam_core/utils/spice.py b/src/adam_core/utils/spice.py similarity index 100% rename from adam_core/utils/spice.py rename to src/adam_core/utils/spice.py diff --git a/adam_core/utils/tests/__init__.py b/src/adam_core/utils/tests/__init__.py similarity index 100% rename from adam_core/utils/tests/__init__.py rename to src/adam_core/utils/tests/__init__.py diff --git a/adam_core/utils/tests/test_benchmarks.py b/src/adam_core/utils/tests/test_benchmarks.py similarity index 100% rename from adam_core/utils/tests/test_benchmarks.py rename to src/adam_core/utils/tests/test_benchmarks.py diff --git a/adam_core/utils/tests/test_mpc.py b/src/adam_core/utils/tests/test_mpc.py similarity index 100% rename from adam_core/utils/tests/test_mpc.py rename to src/adam_core/utils/tests/test_mpc.py diff --git a/adam_core/utils/tests/test_spice.py b/src/adam_core/utils/tests/test_spice.py similarity index 100% rename from adam_core/utils/tests/test_spice.py rename to src/adam_core/utils/tests/test_spice.py diff --git a/adam_core/version.py b/src/adam_core/version.py similarity index 100% rename from adam_core/version.py rename to src/adam_core/version.py