Skip to content

Commit

Permalink
Merge pull request #4 from B612-Asteroid-Institute/subpackage-reset
Browse files Browse the repository at this point in the history
New adam-assist propagator and impact detector as subpackage
  • Loading branch information
akoumjian authored May 13, 2024
2 parents 48eb5e6 + 720d58c commit 75f65e1
Show file tree
Hide file tree
Showing 8 changed files with 616 additions and 587 deletions.
40 changes: 40 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: pip - Build Lint Test and Coverage

on:
push:
branches: [ main, "v*"]
pull_request:
branches: [ main, "v*"]

jobs:
build-lint-test-coverage:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.11"]
defaults:
run:
shell: bash -l {0}

steps:
- name: Checkout git repo
uses: actions/checkout@v3
- name: Get git tags
run: git fetch --prune --unshallow --tags
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: "pip"
# # Use pip to install dependencies
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install .[dev]
# Run tests
- name: Run tests
run: |
pytest tests/ --cov=src --cov-report xml
- name: Coveralls
uses: coverallsapp/github-action@v2
with:
path-to-lcov: coverage.xml
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,6 @@ dmypy.json

# Convenience file for docker development
.docker_bash_history.txt

# As a library, we don't include poetry lock files
poetry.lock
63 changes: 41 additions & 22 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,31 +1,50 @@
[build-system]
requires = ["setuptools"]
build-backend = "setuptools.build_meta"

[project]
name = "adam-assist"
dynamic = ["version"]
version = "0.1.0"
description = 'ADAM Core Propagator class using ASSIST'
authors = [
{ name = "Alec Koumjian", email = "[email protected]" },
{ name = "Kathleen Kiker" }
]
readme = "README.md"
requires-python = ">=3.11"
keywords = []
authors = [{ name = "Alec Koumjian", email = "[email protected]" }]
classifiers = [
"Development Status :: 4 - Beta",
"Programming Language :: Python",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: Implementation :: CPython",
]
requires-python = ">=3.11,<4.0"
dependencies = [
"assist @ git+https://github.com/B612-Asteroid-Institute/assist.git@ak/wip",
"adam-core @ git+https://github.com/B612-Asteroid-Institute/adam_core@main",
"naif-de440",
"numpy",
"rebound",
"ray",
"adam-core @ git+https://github.com/B612-Asteroid-Institute/adam_core.git@ak/impacts",
"assist",
"naif-de440",
"numpy",
"ray",
"spiceypy>=6.0.0"
]

[build-system]
requires = ["pdm-backend"]
build-backend = "pdm.backend"
[tool.pdm.build]
includes = ["src/adam_core/"]
# package-dir = "src"

[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"
"Documentation" = "https://github.com/unknown/adam-assist#readme"
"Issues" = "https://github.com/unknown/adam-assist/issues"
"Source" = "https://github.com/unknown/adam-assist"


[project.optional-dependencies]
dev = [
"pytest",
"pytest-cov",
"pytest-benchmark",
"black",
"isort",
"ipython"
]

[tool.black]
line-length = 88

[tool.isort]
profile = "black"


1 change: 0 additions & 1 deletion src/adam_assist/__about__.py

This file was deleted.

Loading

0 comments on commit 75f65e1

Please sign in to comment.