From 4322acf5041d7e3781fdd6c8fd7015044a951336 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Tue, 7 Oct 2025 09:45:09 +0100 Subject: [PATCH 1/4] Update cruft with batchpr --- .cruft.json | 6 +++--- .github/workflows/ci.yml | 16 +++++++++++++++- .ruff.toml | 2 -- pyproject.toml | 7 +++++++ tox.ini | 6 ++++++ 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/.cruft.json b/.cruft.json index 8b0c480..8efa1b1 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/sunpy/package-template", - "commit": "7958151d0246956f1e95889e8e3fa5abc4a3a129", + "commit": "bea8060eef60df35f7df61d9db1d56b838bda01a", "checkout": null, "context": { "cookiecutter": { @@ -17,7 +17,7 @@ "changelog_url": "https://docs.sunpy.org/projects/streamtracer/en/stable/whatsnew/changelog.html", "issue_tracker_url": "https://github.com/sunpy/streamtracer/issues", "license": "GNU GPL v3+", - "minimum_python_version": "3.10", + "minimum_python_version": "3.12", "use_compiled_extensions": "n", "enable_dynamic_dev_versions": "n", "include_example_code": "n", @@ -32,7 +32,7 @@ ".github/workflows/sub_package_update.yml" ], "_template": "https://github.com/sunpy/package-template", - "_commit": "7958151d0246956f1e95889e8e3fa5abc4a3a129" + "_commit": "bea8060eef60df35f7df61d9db1d56b838bda01a" } }, "directory": null diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8675992..a3c34eb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,7 +50,11 @@ jobs: sdist_verify: runs-on: ubuntu-latest steps: +<<<<<<< - uses: actions/checkout@v5 +======= + - uses: actions/checkout@v4 +>>>>>>> - uses: actions/setup-python@v6 with: python-version: '3.13' @@ -67,13 +71,19 @@ jobs: coverage: codecov toxdeps: tox-pypi-filter envs: | - - windows: py311 + - linux: py314 + - windows: py312 - macos: py312 +<<<<<<< - linux: py310-oldestdeps - linux: py312 runs-on: ubuntu-24.04-arm - linux: py313-devdeps - linux: py313 +======= + - linux: py312-oldestdeps + - linux: py314-devdeps +>>>>>>> secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} @@ -103,7 +113,11 @@ jobs: needs: [test, docs] uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish.yml@v2 with: +<<<<<<< sdist: true +======= + python-version: '3.13' +>>>>>>> test_extras: 'tests' test_command: 'pytest -p no:warnings --doctest-rst --pyargs streamtracer' submodules: false diff --git a/.ruff.toml b/.ruff.toml index e3927b8..c5b9068 100644 --- a/.ruff.toml +++ b/.ruff.toml @@ -34,8 +34,6 @@ select = [ extend-ignore = [ # pycodestyle (E, W) "E501", # ignore line length will use a formatter instead - # pyupgrade (UP) - "UP038", # Use | in isinstance - not compatible with models and is slower # pytest (PT) "PT001", # Always use pytest.fixture() "PT023", # Always use () on pytest decorators diff --git a/pyproject.toml b/pyproject.toml index 718435a..9421615 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,10 +6,17 @@ build-backend = "maturin" [project] name = "streamtracer" +<<<<<<< description = "Python library to calculate streamlines" readme = { file = "README.md", content-type = "text/markdown" } license = { file = "LICENSE" } requires-python = ">=3.10" +======= +description = "Python wrapped fortran to calculate streamlines" +requires-python = ">=3.12" +readme = { file = "README.rst", content-type = "text/x-rst" } +license = { file = "licenses/LICENSE.rst" } +>>>>>>> authors = [ {name = "The SunPy Developers", email="sunpy@googlegroups.com"}, {name = "David Stansby"}, diff --git a/tox.ini b/tox.ini index e079227..0e20535 100644 --- a/tox.ini +++ b/tox.ini @@ -3,9 +3,15 @@ min_version = 4.0 requires = tox-pypi-filter>=0.14 envlist = +<<<<<<< py{310,311,312,313} py312-devdeps py310-oldestdeps +======= + py{312,313,314} + py314-devdeps + py312-oldestdeps +>>>>>>> codestyle build_docs From e1b52814a3c8b6da157d2ff8717ba577bd2e4425 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Tue, 7 Oct 2025 10:20:42 +0100 Subject: [PATCH 2/4] Resolve conflicts --- .cruft.json | 2 +- .github/workflows/ci.yml | 33 ++++++++++----------------------- README.md | 12 ------------ README.rst | 18 ++++++++++++++++++ pyproject.toml | 9 +-------- tox.ini | 6 ------ 6 files changed, 30 insertions(+), 50 deletions(-) delete mode 100644 README.md create mode 100644 README.rst diff --git a/.cruft.json b/.cruft.json index 8efa1b1..82c636c 100644 --- a/.cruft.json +++ b/.cruft.json @@ -6,7 +6,7 @@ "cookiecutter": { "package_name": "streamtracer", "module_name": "streamtracer", - "short_description": "Python wrapped fortran to calculate streamlines", + "short_description": "Python library to calculate streamlines", "author_name": "The SunPy Developers", "author_email": "sunpy@googlegroups.com", "project_url": "https://sunpy.org", diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a3c34eb..1bacb65 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,18 +43,14 @@ jobs: coverage: codecov toxdeps: tox-pypi-filter envs: | - - linux: py314 + - linux: py313 secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} sdist_verify: runs-on: ubuntu-latest steps: -<<<<<<< - uses: actions/checkout@v5 -======= - - uses: actions/checkout@v4 ->>>>>>> - uses: actions/setup-python@v6 with: python-version: '3.13' @@ -74,16 +70,10 @@ jobs: - linux: py314 - windows: py312 - macos: py312 -<<<<<<< - - linux: py310-oldestdeps - - linux: py312 - runs-on: ubuntu-24.04-arm - - linux: py313-devdeps - - linux: py313 -======= - linux: py312-oldestdeps - linux: py314-devdeps ->>>>>>> + - linux: py313 + runs-on: ubuntu-24.04-arm secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} @@ -113,21 +103,18 @@ jobs: needs: [test, docs] uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish.yml@v2 with: -<<<<<<< - sdist: true -======= python-version: '3.13' ->>>>>>> + sdist: true test_extras: 'tests' test_command: 'pytest -p no:warnings --doctest-rst --pyargs streamtracer' submodules: false targets: | - - cp3{10,11,12,13,14}-manylinux_x86_64 - - cp3{10,11,12,13,14}-musllinux_x86_64 - - cp3{10,11,12,13,14}-macosx_x86_64 - - cp3{10,11,12,13,14}-macosx_arm64 - - cp3{10,11,12,13,14}-win_amd64 - - target: cp3{10,11,12,13,14}-manylinux_aarch64 + - cp3{12,13,14}-manylinux_x86_64 + - cp3{12,13,14}-musllinux_x86_64 + - cp3{12,13,14}-macosx_x86_64 + - cp3{12,13,14}-macosx_arm64 + - cp3{12,13,14}-win_amd64 + - target: cp3{12,13,14}-manylinux_aarch64 runs-on: ubuntu-24.04-arm secrets: pypi_token: ${{ secrets.pypi_token }} diff --git a/README.md b/README.md deleted file mode 100644 index 75024f9..0000000 --- a/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# streamtracer - -Fast streamline tracing in python - -[![Documentation Status](https://readthedocs.org/projects/streamtracer/badge/?version=stable)](https://docs.sunpy.org/projects/streamtracer/en/stable/?badge=stable) -[![Build Status](https://github.com/sunpy/streamtracer/actions/workflows/ci.yml/badge.svg)](https://github.com/sunpy/streamtracer/actions/workflows/ci.yml) -[![codecov](https://codecov.io/gh/sunpy/streamtracer/graph/badge.svg?token=4AzS0q7VPY)](https://codecov.io/gh/sunpy/streamtracer) - -## Documentation - -For full documentation, including installation instructions, see -https://docs.sunpy.org/projects/streamtracer diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..d25772c --- /dev/null +++ b/README.rst @@ -0,0 +1,18 @@ +streamtracer +============ + +Fast streamline tracing in python + +|Documentation Status| |Build Status| |codecov| + +Documentation +------------- + +For full documentation, including installation instructions, see https://docs.sunpy.org/projects/streamtracer + +.. |Documentation Status| image:: https://readthedocs.org/projects/streamtracer/badge/?version=stable + :target: https://docs.sunpy.org/projects/streamtracer/en/stable/?badge=stable +.. |Build Status| image:: https://github.com/sunpy/streamtracer/actions/workflows/ci.yml/badge.svg + :target: https://github.com/sunpy/streamtracer/actions/workflows/ci.yml +.. |codecov| image:: https://codecov.io/gh/sunpy/streamtracer/graph/badge.svg?token=4AzS0q7VPY + :target: https://codecov.io/gh/sunpy/streamtracer diff --git a/pyproject.toml b/pyproject.toml index 9421615..8876800 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,17 +6,10 @@ build-backend = "maturin" [project] name = "streamtracer" -<<<<<<< description = "Python library to calculate streamlines" -readme = { file = "README.md", content-type = "text/markdown" } -license = { file = "LICENSE" } -requires-python = ">=3.10" -======= -description = "Python wrapped fortran to calculate streamlines" requires-python = ">=3.12" readme = { file = "README.rst", content-type = "text/x-rst" } -license = { file = "licenses/LICENSE.rst" } ->>>>>>> +license = { file = "LICENSE" } authors = [ {name = "The SunPy Developers", email="sunpy@googlegroups.com"}, {name = "David Stansby"}, diff --git a/tox.ini b/tox.ini index 0e20535..40c770a 100644 --- a/tox.ini +++ b/tox.ini @@ -3,15 +3,9 @@ min_version = 4.0 requires = tox-pypi-filter>=0.14 envlist = -<<<<<<< - py{310,311,312,313} - py312-devdeps - py310-oldestdeps -======= py{312,313,314} py314-devdeps py312-oldestdeps ->>>>>>> codestyle build_docs From 77329a741875ef659ccb4d9871b8cf4d1dead2e8 Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Tue, 7 Oct 2025 10:07:35 -0700 Subject: [PATCH 3/4] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1bacb65..02b1c2d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -103,7 +103,7 @@ jobs: needs: [test, docs] uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish.yml@v2 with: - python-version: '3.13' + python_version: '3.13' sdist: true test_extras: 'tests' test_command: 'pytest -p no:warnings --doctest-rst --pyargs streamtracer' From 3ead188d2ebac1071c704adce0b82234dcaa915a Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Tue, 7 Oct 2025 10:09:36 -0700 Subject: [PATCH 4/4] Update ci.yml --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 02b1c2d..bbfba16 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -103,7 +103,6 @@ jobs: needs: [test, docs] uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish.yml@v2 with: - python_version: '3.13' sdist: true test_extras: 'tests' test_command: 'pytest -p no:warnings --doctest-rst --pyargs streamtracer'