From 2d68418047c05e2d0b60dd645148dcff45d4aca5 Mon Sep 17 00:00:00 2001 From: Thomas Robitaille Date: Fri, 10 Nov 2023 23:02:05 +0000 Subject: [PATCH 1/2] Update syntax for installing from git repos to latest recommended, which fixes the sunpy build --- .github/workflows/integration_testing.yml | 3 +-- tox.ini | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/integration_testing.yml b/.github/workflows/integration_testing.yml index 6394913..feb2358 100644 --- a/.github/workflows/integration_testing.yml +++ b/.github/workflows/integration_testing.yml @@ -27,5 +27,4 @@ jobs: - linux: py311-reproject - linux: py311-specreduce - linux: py311-specutils - # FIXME: Chained dependencies in sunpy/setup.cfg not working here. - #- linux: py311-sunpy + - linux: py311-sunpy diff --git a/tox.ini b/tox.ini index 3aa3a24..6bde606 100644 --- a/tox.ini +++ b/tox.ini @@ -24,17 +24,17 @@ pip_pre = true # side effects and make sure all test suites pass with all packages deps = astropy[all,test] - asdf_astropy,all: git+https://github.com/astropy/asdf-astropy.git#egg=asdf_astropy[test] - astropy_healpix,all: git+https://github.com/astropy/astropy-healpix.git#egg=astropy_healpix[test] - astroquery,all: git+https://github.com/astropy/astroquery.git#egg=astroquery[test,all] + asdf_astropy,all: asdf_astropy[test] @ git+https://github.com/astropy/asdf-astropy.git + astropy_healpix,all: astropy_healpix[test] @ git+https://github.com/astropy/astropy-healpix.git + astroquery,all: astroquery[test,all] @ git+https://github.com/astropy/astroquery.git ccdproc,all: psutil - ccdproc,all: git+https://github.com/astropy/ccdproc.git#egg=ccdproc[test,all] - photutils,all: git+https://github.com/astropy/photutils.git#egg=photutils[test,all] - regions,all: git+https://github.com/astropy/regions.git#egg=regions[test,all] - reproject,all: git+https://github.com/astropy/reproject.git#egg=reproject[test,all] - specreduce,all: git+https://github.com/astropy/specreduce.git#egg=specreduce[test] - specutils,all: git+https://github.com/astropy/specutils.git#egg=specutils[all,test] - sunpy,all: git+https://github.com/sunpy/sunpy.git#egg=sunpy[tests,all] + ccdproc,all: ccdproc[test,all] @ git+https://github.com/astropy/ccdproc.git + photutils,all: photutils[test,all] @ git+https://github.com/astropy/photutils.git + regions,all: regions[test,all] @ git+https://github.com/astropy/regions.git + reproject,all: reproject[test,all] @ git+https://github.com/astropy/reproject.git + specreduce,all: specreduce[test] @ git+https://github.com/astropy/specreduce.git + specutils,all: specutils[all,test] @ git+https://github.com/astropy/specutils.git#egg= + sunpy,all: sunpy[tests,all] @ git+https://github.com/sunpy/sunpy.git skip_install = true @@ -49,4 +49,4 @@ commands = reproject,all: pytest --pyargs reproject specreduce,all: pytest --pyargs specreduce specutils,all: pytest --pyargs specutils - sunpy,all: pytest --pyargs sunpy + sunpy,all: pytest --pyargs sunpy --doctest-ignore-import-errors From 692c974366c9e6715bf83a72ebdec968bea00eea Mon Sep 17 00:00:00 2001 From: Thomas Robitaille Date: Fri, 10 Nov 2023 23:06:27 +0000 Subject: [PATCH 2/2] Run in PRs --- .github/workflows/integration_testing.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/integration_testing.yml b/.github/workflows/integration_testing.yml index feb2358..93f0dba 100644 --- a/.github/workflows/integration_testing.yml +++ b/.github/workflows/integration_testing.yml @@ -2,6 +2,7 @@ name: astropy_rc_basic on: workflow_dispatch: + pull_request: concurrency: group: ${{ github.workflow }}-${{ github.ref }}