Skip to content

Commit

Permalink
Merge branch 'astrohack-dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
vsmagalhaes committed Jul 22, 2024
2 parents ffc482b + 309b853 commit 6ac5028
Show file tree
Hide file tree
Showing 108 changed files with 13,606 additions and 7,054 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/python-testing-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ name: Linux
env:
ROOT_DIR: /home/runner/work/astrohack/astrohack/src/astrohack
on:
workflow_dispatch:

push:
paths-ignore:
- '**.md'
Expand All @@ -17,12 +19,12 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python-version: ["3.8","3.9","3.10","3.11"]
python-version: ["3.9","3.10","3.11"]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python 3
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-testing-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
fail-fast: false
matrix:
os: ["macos-latest"]
python-version: ["3.8", "3.9", "3.10","3.11"]
python-version: ["3.9", "3.10","3.11"]
steps:
- name: Setup Conda
uses: conda-incubator/setup-miniconda@v2
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
.DS_Store
__pycache__
__pycache__
.zattrs
.zgroup
.zmetadata
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
![astrohack](docs/_media/astrohack_logo.png)

[![Python 3.8 3.9 3.10 3.11](https://img.shields.io/badge/python-3.8%20%7C%203.9%20%7C%203.10%20%7C%203.11-blue)](https://www.python.org/downloads/release/python-380/)
[![Python 3.9 3.10 3.11](https://img.shields.io/badge/python-3.9%20%7C%203.10%20%7C%203.11-blue)](https://www.python.org/downloads/release/python-380/)
![Linux Tests](https://github.com/casangi/astrohack/actions/workflows/python-testing-linux.yml/badge.svg)
![macOS Tests](https://github.com/casangi/astrohack/actions/workflows/python-testing-macos.yml/badge.svg)
![Published](https://github.com/casangi/astrohack/actions/workflows/pythonpublish.yml/badge.svg)
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/benchmarks.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import os
import astrohack

from graphviper.dask.client import local_client
from graphviper.dask.client.client import local_client
from astrohack.extract_holog import extract_holog

from astrohack.holog import holog
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
autoapi_options = ['show-module-summary']
autoapi_template_dir = '_templates'
autoapi_keep_files = True
autoapi_ignore = ['*/_panel_classes/*','*/_utils/*','*/visualization/*','*/__pycache__/*','*/data/_*']
#autoapi_ignore = ['*/_panel_classes/*','*/_utils/*','*/docs/*','*/visualization/*','*/__pycache__/*']
autoapi_ignore = ['*/_panel_classes/*','*/utils/*','*/visualization/*','*/__pycache__/*','*/data/_*']
#autoapi_ignore = ['*/_panel_classes/*','*/utils/*','*/docs/*','*/visualization/*','*/__pycache__/*']

# Napoleon settings
#napoleon_google_docstring = True
Expand Down
2 changes: 1 addition & 1 deletion docs/introduction.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.16"
"version": "3.10.13"
}
},
"nbformat": 4,
Expand Down
1,259 changes: 837 additions & 422 deletions docs/locit_tutorial.ipynb

Large diffs are not rendered by default.

Loading

0 comments on commit 6ac5028

Please sign in to comment.