Update package settigns

.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/[email protected]
         with:
-          github-token: ${{ secrets.COVERALLS_TOKEN }}
           path-to-lcov: coverage.xml

pyproject.toml

@@ -1,128 +1,78 @@
-[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 = "[email protected]" },
-  { name = "Alec Koumjian", email = "[email protected]" },
-  { name = "Joachim Moeyens", email = "[email protected]" },
-  { name = "Spencer Nelson", email = "[email protected]" },
-  { name = "Nate Tellis", email = "[email protected]" },
+    { name = "Alec Koumjian", email = "[email protected]" },
+    { 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
 
 [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"]

adam_core/coordinates/variants.py → 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(

adam_core/orbit_determination/tests/test_differential_correction.py → 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
 
 

adam_core/orbit_determination/tests/test_evaluate.py → 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
 
 

adam_core/utils/helpers/observations.py → 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