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
4 changes: 2 additions & 2 deletions .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
_commit: 3561fcd
_commit: 024a41b
_src_path: gh:scipp/copier_template
description: Reflectometry data reduction for the European Spallation Source
max_python: '3.13'
min_python: '3.10'
min_python: '3.11'
namespace_package: ess
nightly_deps: plopp,sciline,scippneutron,scippnexus,scipp
orgname: scipp
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-version-ci
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.10
3.11
44 changes: 2 additions & 42 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,6 @@ defaults:
shell: bash -l {0} # required for conda env

jobs:
build_conda:
name: Conda build
runs-on: 'ubuntu-24.04'

steps:
- uses: actions/checkout@v4
with:
submodules: true
fetch-depth: 0 # history required so setuptools_scm can determine version

- uses: mamba-org/setup-micromamba@v1
with:
environment-name: build-env
create-args: >-
conda-build
boa
- run: conda mambabuild --channel conda-forge --channel scipp --no-anaconda-upload --override-channels --output-folder conda/package conda

- uses: actions/upload-artifact@v4
with:
name: conda-package-noarch
path: conda/package/noarch/*.tar.bz2

build_wheels:
name: Wheels
runs-on: 'ubuntu-24.04'
Expand Down Expand Up @@ -60,7 +37,7 @@ jobs:

upload_pypi:
name: Deploy PyPI
needs: [build_wheels, build_conda]
needs: [build_wheels]
runs-on: 'ubuntu-24.04'
environment: release
permissions:
Expand All @@ -70,25 +47,8 @@ jobs:
- uses: actions/download-artifact@v4
- uses: pypa/gh-action-pypi-publish@v1.12.4

upload_conda:
name: Deploy Conda
needs: [build_wheels, build_conda]
runs-on: 'ubuntu-24.04'
if: github.event_name == 'release' && github.event.action == 'published'

steps:
- uses: actions/download-artifact@v4
- uses: mamba-org/setup-micromamba@v1
with:
environment-name: upload-env
# frozen python due to breaking removal of 'imp' in 3.12
create-args: >-
anaconda-client
python=3.11
- run: anaconda --token ${{ secrets.ANACONDATOKEN }} upload --user scipp --label main $(ls conda-package-noarch/*.tar.bz2)

docs:
needs: [upload_conda, upload_pypi]
needs: [upload_pypi]
uses: ./.github/workflows/docs.yml
with:
publish: ${{ github.event_name == 'release' && github.event.action == 'published' }}
Expand Down
1 change: 0 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ repos:
- id: check-merge-conflict
- id: check-toml
- id: check-yaml
exclude: conda/meta.yaml
- id: detect-private-key
- id: trailing-whitespace
args: [ --markdown-linebreak-ext=md ]
Expand Down
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.10
3.11
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CODE_OF_CONDUCT.md)
[![PyPI badge](http://img.shields.io/pypi/v/essreflectometry.svg)](https://pypi.python.org/pypi/essreflectometry)
[![Anaconda-Server Badge](https://anaconda.org/scipp/essreflectometry/badges/version.svg)](https://anaconda.org/scipp/essreflectometry)
[![Anaconda-Server Badge](https://anaconda.org/conda-forge/essreflectometry/badges/version.svg)](https://anaconda.org/conda-forge/essreflectometry)
[![License: BSD 3-Clause](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](LICENSE)

# ESSreflectometry
Expand Down
57 changes: 0 additions & 57 deletions conda/meta.yaml

This file was deleted.

5 changes: 3 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
},
{
"name": "Conda",
"url": "https://anaconda.org/scipp/essreflectometry",
"url": "https://anaconda.org/conda-forge/essreflectometry",
"icon": "fa-custom fa-anaconda",
"type": "fontawesome",
},
Expand Down Expand Up @@ -268,7 +268,8 @@ def do_not_plot(*args, **kwargs):
r'https?://github\.com/.*?/blob/[a-f0-9]+/.+?#',
# Linkcheck seems to be denied access by some DOI resolvers.
# Since DOIs are supposed to be permanent, we don't need to check them.'
r'https://doi\.org/',
r'https?://doi\.org/',
r'https?://dx\.doi\.org/',
]

# -- Options for Matplotlib in notebooks ----------------------------------
Expand Down
2 changes: 1 addition & 1 deletion docs/developer/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Alternatively, if you want a different workflow, take a look at ``tox.ini`` or `
Run the tests using

```sh
tox -e py310
tox -e py311
```

(or just `tox` if you want to run all environments).
Expand Down
2 changes: 1 addition & 1 deletion docs/user-guide/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pip install essreflectometry
````
````{tab-item} conda
```sh
conda install -c conda-forge -c scipp essreflectometry
conda install -c conda-forge essreflectometry
```
````
`````
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,13 @@ classifiers = [
"Operating System :: OS Independent",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Topic :: Scientific/Engineering",
"Typing :: Typed",
]
requires-python = ">=3.10"
requires-python = ">=3.11"

# IMPORTANT:
# Run 'tox -e deps' after making changes here. This will update requirement files.
Expand Down
10 changes: 5 additions & 5 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ click==8.2.1
# via dask
cloudpickle==3.1.1
# via dask
contourpy==1.3.2
contourpy==1.3.3
# via matplotlib
cyclebane==24.10.0
# via sciline
Expand Down Expand Up @@ -47,15 +47,15 @@ lazy-loader==0.4
# scippneutron
locket==1.0.0
# via partd
matplotlib==3.10.3
matplotlib==3.10.5
# via
# mpltoolbox
# plopp
mpltoolbox==25.5.0
# via scippneutron
networkx==3.4.2
networkx==3.5
# via cyclebane
numpy==2.2.6
numpy==2.3.2
# via
# contourpy
# h5py
Expand Down Expand Up @@ -119,7 +119,7 @@ scippnexus==25.6.0
# -r base.in
# essreduce
# scippneutron
scipy==1.15.3
scipy==1.16.1
# via
# scippneutron
# scippnexus
Expand Down
8 changes: 1 addition & 7 deletions requirements/basetest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@
#
# requirements upgrade
#
certifi==2025.7.14
certifi==2025.8.3
# via requests
charset-normalizer==3.4.2
# via requests
exceptiongroup==1.3.0
# via pytest
idna==3.10
# via requests
iniconfig==2.1.0
Expand All @@ -31,9 +29,5 @@ pytest==8.4.1
# via -r basetest.in
requests==2.32.4
# via pooch
tomli==2.2.1
# via pytest
typing-extensions==4.14.1
# via exceptiongroup
urllib3==2.5.0
# via requests
14 changes: 4 additions & 10 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#
cachetools==6.1.0
# via tox
certifi==2025.7.14
certifi==2025.8.3
# via requests
chardet==5.2.0
# via tox
Expand All @@ -23,7 +23,7 @@ filelock==3.18.0
# virtualenv
gitdb==4.0.12
# via gitpython
gitpython==3.1.44
gitpython==3.1.45
# via -r ci.in
idna==3.10
# via requests
Expand All @@ -44,15 +44,9 @@ requests==2.32.4
# via -r ci.in
smmap==5.0.2
# via gitdb
tomli==2.2.1
# via
# pyproject-api
# tox
tox==4.27.0
tox==4.28.4
# via -r ci.in
typing-extensions==4.14.1
# via tox
urllib3==2.5.0
# via requests
virtualenv==20.31.2
virtualenv==20.33.1
# via tox
18 changes: 11 additions & 7 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@
-r static.txt
-r test.txt
-r wheels.txt
anyio==4.9.0
anyio==4.10.0
# via
# httpx
# jupyter-server
argon2-cffi==25.1.0
# via jupyter-server
argon2-cffi-bindings==21.2.0
argon2-cffi-bindings==25.1.0
# via argon2-cffi
arrow==1.3.0
# via isoduration
async-lru==2.0.5
# via jupyterlab
cffi==1.17.1
# via argon2-cffi-bindings
copier==9.8.0
copier==9.9.0
# via -r dev.in
dunamai==1.25.0
# via copier
Expand All @@ -48,14 +48,14 @@ json5==0.12.0
# via jupyterlab-server
jsonpointer==3.0.0
# via jsonschema
jsonschema[format-nongpl]==4.24.1
jsonschema[format-nongpl]==4.25.0
# via
# jupyter-events
# jupyterlab-server
# nbformat
jupyter-events==0.12.0
# via jupyter-server
jupyter-lsp==2.2.5
jupyter-lsp==2.2.6
# via jupyterlab
jupyter-server==2.16.0
# via
Expand All @@ -65,17 +65,19 @@ jupyter-server==2.16.0
# notebook-shim
jupyter-server-terminals==0.5.3
# via jupyter-server
jupyterlab==4.4.4
jupyterlab==4.4.5
# via -r dev.in
jupyterlab-server==2.27.3
# via jupyterlab
lark==1.2.2
# via rfc3987-syntax
notebook-shim==0.2.4
# via jupyterlab
overrides==7.7.0
# via jupyter-server
pip-compile-multi==3.2.1
# via -r dev.in
pip-tools==7.4.1
pip-tools==7.5.0
# via pip-compile-multi
plumbum==1.9.0
# via copier
Expand All @@ -95,6 +97,8 @@ rfc3986-validator==0.1.1
# via
# jsonschema
# jupyter-events
rfc3987-syntax==1.1.0
# via jsonschema
send2trash==1.8.3
# via jupyter-server
sniffio==1.3.1
Expand Down
Loading
Loading