From 37814fd96f8a7e2d55b7be9d388930edf98d5ecc Mon Sep 17 00:00:00 2001 From: "Karl D. Gordon" Date: Tue, 14 May 2024 15:24:44 -0400 Subject: [PATCH 1/3] updating tox --- .github/workflows/tox-tests.yml | 34 ++++++++++++++++----------------- tox.ini | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/tox-tests.yml b/.github/workflows/tox-tests.yml index 698cf3f2..fe3434ff 100644 --- a/.github/workflows/tox-tests.yml +++ b/.github/workflows/tox-tests.yml @@ -29,15 +29,15 @@ jobs: os: [ubuntu-latest, macos-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 @@ -71,36 +71,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: @@ -119,11 +119,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 @@ -139,11 +139,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 diff --git a/tox.ini b/tox.ini index 8b533b6a..9511c33c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{39,310,311}-test{,-alldeps}{,-cov} + py{310,311,312}-test{,-alldeps}{,-cov} build_docs linkcheck codestyle From e139808afbaf41ac72a778eba4a21a6a70d2c55b Mon Sep 17 00:00:00 2001 From: "Karl D. Gordon" Date: Tue, 14 May 2024 15:28:46 -0400 Subject: [PATCH 2/3] minor pep8 issue --- beast/plotting/plot_graphic_file_flow.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/beast/plotting/plot_graphic_file_flow.py b/beast/plotting/plot_graphic_file_flow.py index 4c464f75..dabbd4aa 100644 --- a/beast/plotting/plot_graphic_file_flow.py +++ b/beast/plotting/plot_graphic_file_flow.py @@ -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}") @@ -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}") From bd3d10545b7cb755431a3198cca312470ab499c2 Mon Sep 17 00:00:00 2001 From: "Karl D. Gordon" Date: Tue, 14 May 2024 15:36:27 -0400 Subject: [PATCH 3/3] h5py issue on macos --- .github/workflows/tox-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tox-tests.yml b/.github/workflows/tox-tests.yml index fe3434ff..c07e0e5c 100644 --- a/.github/workflows/tox-tests.yml +++ b/.github/workflows/tox-tests.yml @@ -26,7 +26,9 @@ 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: [10, 11, 12]