From a109b0eca2eb8ab38d6c9a2178a9becf866b6646 Mon Sep 17 00:00:00 2001 From: David Kaplan Date: Fri, 13 Oct 2023 09:22:51 -0500 Subject: [PATCH 1/8] try py3.12 --- tox.ini | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tox.ini b/tox.ini index c996f91f6..ca637c555 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ envlist = report codestyle black - py{38,39,310}-test{,-alldeps,-devdeps}{,-cov} + py{38,39,310,311,312}-test{,-alldeps,-devdeps}{,-cov} skip_missing_interpreters = True @@ -45,8 +45,8 @@ commands = cov: coverage xml -o {toxinidir}/coverage.xml depends = - {py38,py39,py310}: clean - report: py38,py39,py310 + {py38,py39,py310,py311}: clean + report: py38,py39,py310,py312 docs: notebooks [testenv:ephemeris_connection] @@ -80,7 +80,7 @@ commands = [testenv:notebooks] description = update the notebooks -basepython = python3.10 +basepython = python3.12 deps = traitlets sphinx >= 2.2, != 5.1.0 @@ -106,7 +106,7 @@ commands = coverage erase [testenv:docs] changedir = {toxinidir}/docs description = invoke sphinx-build to build the HTML docs -basepython = python3.10 +basepython = python3.12 deps = traitlets sphinx >= 2.2, != 5.1.0 From dd2b0e7f8bef5b77ffc4fe844c902fe86054f83d Mon Sep 17 00:00:00 2001 From: David Kaplan Date: Fri, 13 Oct 2023 09:31:05 -0500 Subject: [PATCH 2/8] try py3.12 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index ca637c555..aebe7f5b1 100644 --- a/tox.ini +++ b/tox.ini @@ -45,7 +45,7 @@ commands = cov: coverage xml -o {toxinidir}/coverage.xml depends = - {py38,py39,py310,py311}: clean + {py38,py39,py310,py311,py312}: clean report: py38,py39,py310,py312 docs: notebooks From 4d79bd4cba38461e714d4cba4483360c578951d0 Mon Sep 17 00:00:00 2001 From: David Kaplan Date: Fri, 13 Oct 2023 09:32:52 -0500 Subject: [PATCH 3/8] try py3.12 --- setup.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.cfg b/setup.cfg index 52fa9ec59..b8c3fc47c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,6 +18,8 @@ classifier = Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Scientific/Engineering :: Astronomy Topic :: Software Development :: Libraries :: Python Modules From 5a705cb82f14e83c6b59d75a18094d7436e825bc Mon Sep 17 00:00:00 2001 From: David Kaplan Date: Fri, 13 Oct 2023 09:47:24 -0500 Subject: [PATCH 4/8] change version for CI --- .github/workflows/ci_test.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci_test.yml b/.github/workflows/ci_test.yml index 1fa47a4ce..bcd8fab46 100644 --- a/.github/workflows/ci_test.yml +++ b/.github/workflows/ci_test.yml @@ -24,16 +24,16 @@ jobs: matrix: include: - os: ubuntu-latest - python: '3.10' + python: '3.12' tox_env: 'ephemeris_connection' - os: ubuntu-latest - python: '3.10' + python: '3.12' tox_env: 'black' - os: ubuntu-latest - python: '3.10' - tox_env: 'py310-test-cov' + python: '3.12' + tox_env: 'py312-test-cov' - os: ubuntu-latest - python: '3.10' + python: '3.12' tox_env: 'notebooks' # - os: ubuntu-latest # python: '3.8' @@ -42,8 +42,8 @@ jobs: # python: '3.10' # tox_env: 'py310-test-alldeps-cov' - os: macos-latest - python: '3.10' - tox_env: 'py310-test' + python: '3.12' + tox_env: 'py312-test' # - os: windows-latest # python: '3.8' # tox_env: 'py38-test' From e567ade5031d1df0cf220cf48539ae1b972dbcc4 Mon Sep 17 00:00:00 2001 From: David Kaplan Date: Fri, 13 Oct 2023 10:01:48 -0500 Subject: [PATCH 5/8] explicit setuptools install --- .github/workflows/ci_test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_test.yml b/.github/workflows/ci_test.yml index bcd8fab46..374287ced 100644 --- a/.github/workflows/ci_test.yml +++ b/.github/workflows/ci_test.yml @@ -65,6 +65,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install tox + python -m pip install setuptools - name: Install graphviz dependency if: "endsWith(matrix.tox_env, 'build_docs')" run: sudo apt-get -y install graphviz From 1949658dfdfc81aec1a422813ac44dd78ddea666 Mon Sep 17 00:00:00 2001 From: David Kaplan Date: Fri, 13 Oct 2023 10:10:16 -0500 Subject: [PATCH 6/8] explicit pkg_resources install --- .github/workflows/ci_test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_test.yml b/.github/workflows/ci_test.yml index 374287ced..2c6da71e6 100644 --- a/.github/workflows/ci_test.yml +++ b/.github/workflows/ci_test.yml @@ -66,6 +66,7 @@ jobs: python -m pip install --upgrade pip python -m pip install tox python -m pip install setuptools + python -m pip install pkg_resources - name: Install graphviz dependency if: "endsWith(matrix.tox_env, 'build_docs')" run: sudo apt-get -y install graphviz From 180d8549e644d1852cf2abe0981f331b8a3a002c Mon Sep 17 00:00:00 2001 From: David Kaplan Date: Fri, 13 Oct 2023 10:18:04 -0500 Subject: [PATCH 7/8] still trying to sort out setuptools --- .github/workflows/ci_test.yml | 3 --- tox.ini | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_test.yml b/.github/workflows/ci_test.yml index 2c6da71e6..a1076accc 100644 --- a/.github/workflows/ci_test.yml +++ b/.github/workflows/ci_test.yml @@ -65,8 +65,6 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install tox - python -m pip install setuptools - python -m pip install pkg_resources - name: Install graphviz dependency if: "endsWith(matrix.tox_env, 'build_docs')" run: sudo apt-get -y install graphviz @@ -77,7 +75,6 @@ jobs: run: | python -c "import sys; print(f'Python {sys.version}')" python -c "import pip; print(f'pip {pip.__version__}')" - python -c "import setuptools; print(f'setuptools {setuptools.__version__}')" python -c "import tox; print(f'tox {tox.__version__}')" - name: Run tests run: tox -e ${{ matrix.tox_env }} diff --git a/tox.ini b/tox.ini index aebe7f5b1..2620e7aa3 100644 --- a/tox.ini +++ b/tox.ini @@ -38,6 +38,7 @@ deps = hypothesis numdifftools pathos + setuptools commands = pip freeze !cov: pytest @@ -92,6 +93,7 @@ deps = pytest jupytext black + setuptools commands = jupytext --sync examples/*.py jupytext --pipe black --pipe-fmt py:percent examples/*.ipynb @@ -118,6 +120,7 @@ deps = pytest jupytext black + setuptools commands = sphinx-build -d "{toxworkdir}/docs_doctree" . "{toxworkdir}/docs_out" --color -bhtml {posargs} python -c 'import pathlib; print("documentation available under file://\{0\}".format(pathlib.Path(r"{toxworkdir}") / "docs_out" / "index.html"))' From 4a82214aabc95bd951877f67d866b5b20d9c2921 Mon Sep 17 00:00:00 2001 From: David Kaplan Date: Fri, 13 Oct 2023 10:21:51 -0500 Subject: [PATCH 8/8] fix ephem connection --- .github/workflows/ci_test.yml | 2 +- tox.ini | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_test.yml b/.github/workflows/ci_test.yml index a1076accc..f43615c9c 100644 --- a/.github/workflows/ci_test.yml +++ b/.github/workflows/ci_test.yml @@ -71,7 +71,7 @@ jobs: - name: Install pandoc dependency if: "endsWith(matrix.tox_env, 'docs')" run: sudo apt-get -y install pandoc - - name: Print Python, pip, setuptools, and tox versions + - name: Print Python, pip, and tox versions run: | python -c "import sys; print(f'Python {sys.version}')" python -c "import pip; print(f'pip {pip.__version__}')" diff --git a/tox.ini b/tox.ini index 2620e7aa3..f6d4241a0 100644 --- a/tox.ini +++ b/tox.ini @@ -56,6 +56,8 @@ description = commands = python check_ephemeris_connection.py deps = + setuptools + [testenv:oldestdeps] description = Run tests on Python 3 with minimum supported versions of astropy, numpy