From e6d7b2b351bebf43d9c326cfc164220e12a0da97 Mon Sep 17 00:00:00 2001 From: Brett Date: Tue, 5 Mar 2024 09:40:39 -0500 Subject: [PATCH 1/3] update python versions in ci --- .github/workflows/ci.yml | 6 +++--- .github/workflows/downstream.yml | 4 ++-- tox.ini | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0589f7e0..88e0dc1d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: with: submodules: false # Any env name which does not start with `pyXY` will use this Python version. - default_python: '3.9' + default_python: '3.11' envs: | - macos: py39 - windows: py39 @@ -66,10 +66,10 @@ jobs: fetch-depth: 0 repository: asdf-format/asdf path: asdf - - name: Set up Python 3.9 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.11 - name: Install asdf-standard run: cd asdf-standard && pip install . - name: Install asdf diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index 78a78a38..533e5c73 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -97,10 +97,10 @@ jobs: fetch-depth: 0 repository: ${{ matrix.repository }} path: target - - name: Set up Python 3.9 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.11 - name: Install asdf-standard run: cd asdf-standard && pip install . - name: Install remaining ${{ matrix.package_name }} dependencies diff --git a/tox.ini b/tox.ini index 40f33c3e..fb1dfb7f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py39, py310, py311 +envlist = py39, py310, py311, py312 isolated_build = True [testenv] From 396354e1f80f14d6765bd1c9ff47ad0a5555ddbd Mon Sep 17 00:00:00 2001 From: Brett Date: Tue, 5 Mar 2024 09:41:21 -0500 Subject: [PATCH 2/3] add weldx media install option --- .github/workflows/downstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index 533e5c73..b2fd2cf5 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -54,7 +54,7 @@ jobs: test_command: pytest - package_name: weldx repository: BAMWelDX/weldx - install_command: pip install -e .[test] + install_command: pip install -e .[test,media] test_command: pytest weldx/tests/asdf_tests weldx/schemas --asdf-tests - package_name: sunpy repository: sunpy/sunpy From 77dbf73959fa5db3d8193cebfc81847a4cfa927e Mon Sep 17 00:00:00 2001 From: Brett Date: Tue, 5 Mar 2024 09:47:02 -0500 Subject: [PATCH 3/3] remove astropy from ci --- .github/workflows/downstream.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index b2fd2cf5..a3576db5 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -32,10 +32,6 @@ jobs: fail-fast: false matrix: include: - - package_name: astropy - repository: astropy/astropy - install_command: pip install -e .[test] - test_command: pytest - package_name: gwcs repository: spacetelescope/gwcs install_command: pip install -e .[test]