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

updating tox for latest python and github actions #805

Merged
merged 3 commits into from
May 14, 2024
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
38 changes: 20 additions & 18 deletions .github/workflows/tox-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,20 @@ jobs:
# Only run on ubuntu by default, but can add other os's to the test matrix here.
# For example -- os: [ubuntu-latest, macos-latest, windows-latest]
# windows-latest not possible due to how temp files are used in tests currently
os: [ubuntu-latest, macos-latest]
# macos failing due to an issue installing h5py - KDG 14may24
# os: [ubuntu-latest, macos-latest]
os: [ubuntu-latest]

# Test python version 3.x
python-ver: [9, 10, 11]
python-ver: [10, 11, 12]

# Specify which tox environments to test in this list.
# tox-env: [cov, alldeps, devdeps, astropylts]
tox-env: [alldeps]
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Set up python 3.${{ matrix.python-ver }} with tox environment py3${{ matrix.python-ver }}-${{ matrix.tox-env }} on ${{ matrix.os }}
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: 3.${{ matrix.python-ver }}
- name: Install base dependencies
Expand Down Expand Up @@ -71,36 +73,36 @@ jobs:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[ci skip]')"
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Set up python for astropy lts test
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: 3.9
python-version: 3.11
- name: Install base dependencies
run: |
python -m pip install --upgrade pip
python -m pip install tox
- name: Test with tox
run: |
tox -e py39-astropylts
tox -e py311-astropylts

# Coverage test
cov_test:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[ci skip]')"
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Set up python for coverage test
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: 3.11
python-version: 3.12
- name: Install base dependencies
run: |
python -m pip install --upgrade pip
python -m pip install tox
- name: Test with tox
run: |
tox -e py311-cov -- --remote-data
tox -e py312-cov -- --remote-data
- name: Upload coverage to codecov
uses: codecov/codecov-action@v1
with:
Expand All @@ -119,11 +121,11 @@ jobs:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[ci skip]')"
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Set up Python to build docs with sphinx
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: 3.11
python-version: 3.12
- name: Install base dependencies
run: |
python -m pip install --upgrade pip
Expand All @@ -139,11 +141,11 @@ jobs:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[ci skip]')"
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Python codestyle check
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: 3.11
python-version: 3.12
- name: Install base dependencies
run: |
python -m pip install --upgrade pip
Expand Down
8 changes: 4 additions & 4 deletions beast/plotting/plot_graphic_file_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def plot_graphic_file_flow_sd(n_sd=1, n_sub=3, savefig="png"):
# iterate through source density bins
for s in range(n_sd):

curr_sd = f"SD{s}-{s+1}"
curr_sd = f"SD{s}-{s + 1}"

# files for this source density bin
sg1.node(f"phot{s}", f"phot_{curr_sd}")
Expand Down Expand Up @@ -273,9 +273,9 @@ def plot_graphic_file_flow_subgrid(n_sg=3, savefig="png"):
edges_invis[f"sed{s}"].append(f"obs{s}")
edges_invis[f"sed{s}t"].append(f"obs{s}t")
if s < n_sg - 1:
edges_invis[f"obs{s}"].append(f"sed{s+1}")
edges_invis[f"obs{s}t"].append(f"sed{s+1}t")
edges_invis[f"lnps_{s}"].append(f"lnps_{s+1}")
edges_invis[f"obs{s}"].append(f"sed{s + 1}")
edges_invis[f"obs{s}t"].append(f"sed{s + 1}t")
edges_invis[f"lnps_{s}"].append(f"lnps_{s + 1}")
# output files
edges_invis[f"stat{s}"].append(f"pdf1d{s}")
edges_invis[f"pdf1d{s}"].append(f"pdf2d{s}")
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
envlist =
py{39,310,311}-test{,-alldeps}{,-cov}
py{310,311,312}-test{,-alldeps}{,-cov}
build_docs
linkcheck
codestyle
Expand Down
Loading