From 4f4fc0692948158a57e36f0cf4236fbe7ace6179 Mon Sep 17 00:00:00 2001 From: "Brett M. Morris" Date: Thu, 15 Aug 2024 13:27:55 -0400 Subject: [PATCH] test fixes for numpy v2.0 --- .github/workflows/ci_tests.yml | 18 +++++++++--------- .readthedocs.yml | 14 ++++++-------- docs/conf.py | 2 +- pyproject.toml | 3 +-- tox.ini | 2 +- tynt/download.py | 2 +- 6 files changed, 19 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 2b52e45..001de1f 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -26,22 +26,22 @@ jobs: python: 3.x toxenv: codestyle - - name: Python 3.9 with minimal dependencies, no remote data + - name: Python 3.11 with minimal dependencies, no remote data os: ubuntu-latest - python: 3.9 - toxenv: py39-test + python: 3.11 + toxenv: py311-test toxposargs: --remote-data=none - - name: Python 3.9 with minimal dependencies, with remote data + - name: Python 3.11 with minimal dependencies, with remote data os: ubuntu-latest - python: 3.9 - toxenv: py39-test + python: 3.11 + toxenv: py311-test toxposargs: --remote-data=any - - name: Python 3.9 with latest dev dependencies, with remote data + - name: Python 3.11 with latest dev dependencies, with remote data os: ubuntu-latest - python: 3.9 - toxenv: py39-test-devdeps + python: 3.11 + toxenv: py311-test-devdeps toxposargs: --remote-data=any - name: Test building of Sphinx docs diff --git a/.readthedocs.yml b/.readthedocs.yml index aec633e..5a4c00f 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,18 +1,16 @@ version: 2 -build: - image: latest +sphinx: + configuration: docs/conf.py -conda: - environment: environment.yml +build: + os: ubuntu-22.04 + tools: + python: "3.11" python: - version: 3.8 install: - method: pip path: . extra_requirements: - docs - - all - -formats: [] diff --git a/docs/conf.py b/docs/conf.py index e5a7e51..fed3cf0 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -58,7 +58,7 @@ # Example configuration for intersphinx: refer to the Python standard library. intersphinx_mapping = { - 'https://docs.python.org/': None, + 'python': ('https://docs.python.org/', None), 'numpy': ('https://numpy.org/doc/stable/', None), 'astropy': ('https://docs.astropy.org/en/stable/', None), } diff --git a/pyproject.toml b/pyproject.toml index 7e7daea..ef5da94 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,6 @@ [build-system] requires = ["setuptools", - "setuptools_scm", - "wheel"] + "setuptools_scm"] build-backend = 'setuptools.build_meta' diff --git a/tox.ini b/tox.ini index c1bf9f4..150fc6f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{37,38,39}-test{,-alldeps,-devdeps} + py{311,312}-test{,-alldeps,-devdeps} build_docs codestyle isolated_build = true diff --git a/tynt/download.py b/tynt/download.py index d091b9a..a1cc7cb 100644 --- a/tynt/download.py +++ b/tynt/download.py @@ -15,7 +15,7 @@ class DownloadManager(object): """ # default facilities included in download: include_facilities = ['2MASS', 'SLOAN', 'Kepler', 'TESS', 'HST', 'JWST', - 'LSST', 'Keck', 'WISE', 'WFIRST', 'Spitzer', 'GAIA', + 'LSST', 'Keck', 'WISE', 'WFIRST', 'Roman', 'Spitzer', 'GAIA', 'CHEOPS'] # default photometric systems included in download: