Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .github/workflows/bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,21 @@ on:
required: false
rule:
type: choice
description: Version bump level
description: Version bump level (ignored if explicit version is given)
required: true
options:
- prerelease
- "prerelease --next-phase"
- dev
- prepatch
- preminor
- premajor
- patch
- minor
- major
version:
type: string
description: Explicit version (overrides rule), e.g. "X.Y.Zb0" to enter feature freeze.
required: false
default: ""

jobs:
Bump:
Expand All @@ -27,4 +31,4 @@ jobs:
secrets: inherit
with:
dry-run: ${{ inputs.dry-run }}
rule: ${{ inputs.rule }}
rule: ${{ inputs.version != '' && inputs.version || inputs.rule }}
5 changes: 2 additions & 3 deletions .github/workflows/bump_on_dependency.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
Bump:
name: Bump prerelease version
name: Bump dev version
if: >
github.event.pull_request.merged == true &&
github.event.pull_request.base.ref == 'main' &&
Expand All @@ -16,6 +16,5 @@ jobs:
uses: AstarVienna/DevOps/.github/workflows/bump.yml@main
secrets: inherit
with:
rule: prerelease
rule: dev
branch: main

6 changes: 3 additions & 3 deletions .github/workflows/notebooks_dispatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ jobs:
# is more useful than 5 green and one red. The others can be enabled
# once we fix the problem properly.
# os: [ubuntu-latest, windows-latest, macos-latest]
# python-version: ['3.8', '3.11']
# python-version: ['3.12', '3.14']
os: [ubuntu-latest]
python-version: ["3.11"]
python-version: ["3.12"]
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v7

- name: Install poetry
shell: bash
run: pipx install poetry==2.1.4
run: pipx install poetry==2.4.1

- name: Set up Python
uses: actions/setup-python@v7
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,24 @@ jobs:
name: Offline tests
uses: AstarVienna/DevOps/.github/workflows/tests.yml@main
secrets: inherit
with:
python-versions: '["3.12", "3.13", "3.14"]'
python-min: "3.12" # limited versions for macOS only
python-max: "3.14" # limited versions for macOS only

call-webtests:
name: Network tests
uses: AstarVienna/DevOps/.github/workflows/webtests.yml@main
secrets: inherit
with:
python-versions: '["3.12", "3.14"]'

call-updated-tests:
name: Tests with updated dependencies
uses: AstarVienna/DevOps/.github/workflows/updated_tests.yml@main
secrets: inherit
with:
python-versions: '["3.12", "3.14"]'

call-notebooks-with-clone:
name: Notebook tests
Expand Down
4 changes: 2 additions & 2 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
version: 2

build:
os: "ubuntu-24.04"
os: "ubuntu-26.04"
tools:
python: "3.11"
python: "3.14"
jobs:
post_checkout:
- git clone -n --depth=1 --filter=tree:0 https://github.com/AstarVienna/irdb ./docs/source/examples/inst_pkgs
Expand Down
549 changes: 166 additions & 383 deletions poetry.lock

Large diffs are not rendered by default.

24 changes: 11 additions & 13 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "ScopeSim"
version = "0.12.0b1"
version = "0.12.0b2.dev0"
description = "Generalised telescope observation simulator"
license = {text = "GPL-3.0-or-later"}
authors = [
Expand All @@ -14,18 +14,16 @@ maintainers = [
readme = "README.md"
keywords = [ "astronomy" ]
dynamic = [ "classifiers" ]
requires-python = ">=3.10,<3.15"
requires-python = ">=3.12,<3.15"
dependencies = [
"numpy (>=1.26.4,<2.3.0) ; python_version >= '3.10' and python_version < '3.13'",
"numpy (>=2.3.5,<3.0.0) ; python_version >= '3.13'",
"scipy (>=1.15.3,<1.16.0) ; python_version >= '3.10' and python_version < '3.11'",
"scipy (>=1.17.0,<1.18.0) ; python_version >= '3.11'",
"numpy (>=2.2.6,<3.0.0)",
"scipy (>=1.17.0,<1.18.0)",

"astropy (>=6.1.7,<8.0.0)",
"astropy (>=7.2.2,<9.0.0)",
"matplotlib (>=3.10.8,<4.0.0)",
"pooch (>=1.9.0,<2.0.0)",

"docutils (>=0.19,<1.0)",
"docutils (>=0.22,<1.0)",
"httpxyz (>=0.31.2,<1.0)",
"beautifulsoup4 (>=4.15.0,<5.0.0)",
"lxml (>=6.1.1,<7.0.0)",
Expand All @@ -34,10 +32,10 @@ dependencies = [
"tqdm (>=4.67.4,<5.0.0)",
"packaging (>=26.0,<28.0)",

"synphot (>=1.6.1,<2.0.0)",
"skycalc-ipy (>=0.7.0,<1.0)",
"anisocado (>=0.5.0,<1.0)",
"astar-utils (>=0.6.0,<1.0)"
"synphot (>=1.7.0,<2.0.0)",
"skycalc-ipy (>=0.7.1,<1.0)",
"anisocado (>=0.6.0,<1.0)",
"astar-utils (>=0.7.0,<1.0)"
]

[project.urls]
Expand Down Expand Up @@ -72,7 +70,7 @@ ipykernel = "^7.3.0"
optional = true

[tool.poetry.group.docs.dependencies]
sphinx = "^8.1.3"
sphinx = "^9.1.0"
sphinx-book-theme = "^1.1.4"
jupyter-sphinx = ">=0.5.3"
sphinx-copybutton = ">=0.5.2,<1.0"
Expand Down
2 changes: 1 addition & 1 deletion scopesim/reports/rst_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ def latexify_rst_text(rst_text, filename=None, path=None, title_char="=",
text = "Title\n<<<<<\nSubtitle\n>>>>>>>>\n\n"
parts = publish_parts(
text + rst_text,
writer_name="latex",
writer="latex",
# Settings_overrides to placate FutureWarnings.
# TODO: Decide whether the future defaults look better.
settings_overrides={
Expand Down
2 changes: 1 addition & 1 deletion scopesim/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ def write_report(text, filename=None, output=None):
for fmt in output:
out_text = deepcopy(text)
if fmt.lower() == "latex":
out_text = publish_string(out_text, writer_name="latex")
out_text = publish_string(out_text, writer="latex")
out_text = out_text.decode("utf-8")

suffix = {"rst": ".rst", "latex": ".tex"}[fmt]
Expand Down