Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Link AIMS sample #123

Merged
merged 14 commits into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/conda-build-lint-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,18 @@ jobs:
activate-environment: "thor"
auto-update-conda: true
python-version: ${{ matrix.python-version }}
- name: Install dependencies (excluding adam_core since it is not available via conda)
- name: Install dependencies (excluding adam_core and quivr since they are not available via conda)
run: |
tail +2 requirements.txt > requirements_conda.txt
tail +3 requirements.txt > requirements_conda.txt
conda install -c defaults -c conda-forge -c astropy -c moeyensj --file requirements_conda.txt --yes
- name: Update OBSCODE.dat
run: |
cd $CONDA_PREFIX/share/oorb && ./updateOBSCODE
cp OBSCODE.dat $CONDA_PREFIX/share/openorb/OBSCODE.dat
- name: Install adam_core
- name: Install adam_core and quivr
run: |
pip install adam-core@git+https://github.com/B612-Asteroid-Institute/adam_core@main
pip install quivr>=0.7.1
- name: Build and install
run: pip install . --no-deps
- name: Lint
Expand Down
43 changes: 43 additions & 0 deletions .github/workflows/pip-build-integration-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: pip - Build and Integration Test

on:
schedule:
# Run every day at 20:00 UTC
- cron: '0 20 * * * '

jobs:
build-lint-test-coverage:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest]
python-version: ["3.10"]
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
- name: Set up miniconda
uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: "thor"
auto-update-conda: true
python-version: ${{ matrix.python-version }}
- name: Install openorb using conda
run: conda install -c defaults -c conda-forge openorb --yes
- name: Update OBSCODE.dat
run: |
cd $CONDA_PREFIX/share/oorb && ./updateOBSCODE
cp OBSCODE.dat $CONDA_PREFIX/share/openorb/OBSCODE.dat
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: 'pip' # caching pip dependencies
- name: Build and install
run: pip install .[tests]
- name: Integration Tests
run: pytest . -m "integration"
2 changes: 0 additions & 2 deletions .github/workflows/pip-build-lint-test-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ jobs:
run: pre-commit run --all-files
- name: Test
run: pytest . --cov --cov-report xml
- name: Integration Tests
run: pytest . -m "integration"
- name: Coverage
uses: coverallsapp/[email protected]
with:
Expand Down
24 changes: 11 additions & 13 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,25 @@ requirements:
host:
- python {{ python }}
- pip
- setuptools >=45
- setuptools_scm >=6.0
- setuptools >= 45
- setuptools_scm >= 6.0
- wheel
run:
- python {{ python }}
- astropy >= 5.3.1
- astroquery
- difi
- healpy
- jax
- numpy
- pyarrow >= 13.0.0
- numba
- pandas
- difi
- astropy
- astroquery
- scipy
- pyarrow >= 13.0.0
- pyyaml >= 5.1
- ray-default
- scikit-learn
- pyyaml
- openorb
- scipy
- spiceypy
- matplotlib
- seaborn
- plotly
- ipykernel
- pytest
- pytest-cov
- pre-commit
Expand Down
23 changes: 13 additions & 10 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
adam-core @ git+https://github.com/B612-Asteroid-Institute/adam_core@main
quivr >= 0.7.1
astropy >= 5.3.1
astroquery
difi
healpy
jax
numpy
pyarrow>=13.0.0
numba
openorb
pandas
difi
astropy>=5.3.1
astroquery
scipy
pyarrow >= 13.0.0
pyyaml >= 5.1
ray-default
scikit-learn
healpy
pyyaml>=5.1
openorb
scipy
spiceypy
pytest
pytest-cov
pre-commit
setuptools>=45
setuptools >= 45
wheel
setuptools_scm>=6.0
setuptools_scm >= 6.0
55 changes: 0 additions & 55 deletions runTHOR.py

This file was deleted.

25 changes: 12 additions & 13 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -32,24 +32,21 @@ setup_requires =
setuptools_scm >= 6.0
install_requires =
adam-core @ git+https://github.com/B612-Asteroid-Institute/adam_core@main
numpy
pyarrow >= 13.0.0
numba
pandas
difi
astropy >= 5.3.1
astroquery
jax
quivr>=0.7.1
scipy
scikit-learn
difi
healpy
jax
numpy
numba
pandas
pyarrow >= 13.0.0
pyyaml >= 5.1
quivr >= 0.7.1
ray[default]
scikit-learn
scipy
spiceypy
matplotlib
seaborn
plotly
ipykernel

[options.extras_require]
tests =
Expand All @@ -68,6 +65,8 @@ test=pytest
[tool:pytest]
python_functions = test_*
addopts = -m "not integration"
markers =
integration: Mark a test as an integration test.

[isort]
profile = black
Expand Down
Loading