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
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
_commit: 3561fcd
_commit: 024a41b
_src_path: gh:scipp/copier_template
description: Diffraction data reduction for the European Spallation Source
max_python: '3.13'
Expand Down
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 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/essdiffraction.svg)](https://pypi.python.org/pypi/essdiffraction)
[![Anaconda-Server Badge](https://anaconda.org/scipp/essdiffraction/badges/version.svg)](https://anaconda.org/scipp/essdiffraction)
[![Anaconda-Server Badge](https://anaconda.org/conda-forge/essdiffraction/badges/version.svg)](https://anaconda.org/conda-forge/essdiffraction)
[![License: BSD 3-Clause](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](LICENSE)

# ESSdiffraction
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 @@ -203,7 +203,7 @@
},
{
"name": "Conda",
"url": "https://anaconda.org/scipp/essdiffraction",
"url": "https://anaconda.org/conda-forge/essdiffraction",
"icon": "fa-custom fa-anaconda",
"type": "fontawesome",
},
Expand Down Expand Up @@ -287,7 +287,8 @@ def do_not_plot(*args, **kwargs):
"https://www.sciencedirect.com/science/article/pii/S2773183922000374",
# 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 bibtex ---------------------------------------------------
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 essdiffraction
````
````{tab-item} conda
```sh
conda install -c conda-forge -c scipp essdiffraction
conda install -c conda-forge essdiffraction
```
````
`````
2 changes: 2 additions & 0 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ accessible-pygments==0.0.5
# via pydata-sphinx-theme
alabaster==1.0.0
# via sphinx
appnope==0.1.4
# via ipykernel
attrs==25.3.0
# via
# jsonschema
Expand Down
Loading