Skip to content

Commit b0ab4ac

Browse files
authored
Copier and tox -e deps bump (#194)
* copier update * tox -e deps
1 parent f112e75 commit b0ab4ac

File tree

8 files changed

+10
-105
lines changed

8 files changed

+10
-105
lines changed

.copier-answers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
2-
_commit: 3561fcd
2+
_commit: 024a41b
33
_src_path: gh:scipp/copier_template
44
description: Diffraction data reduction for the European Spallation Source
55
max_python: '3.13'

.github/workflows/release.yml

Lines changed: 2 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,6 @@ defaults:
1010
shell: bash -l {0} # required for conda env
1111

1212
jobs:
13-
build_conda:
14-
name: Conda build
15-
runs-on: 'ubuntu-24.04'
16-
17-
steps:
18-
- uses: actions/checkout@v4
19-
with:
20-
submodules: true
21-
fetch-depth: 0 # history required so setuptools_scm can determine version
22-
23-
- uses: mamba-org/setup-micromamba@v1
24-
with:
25-
environment-name: build-env
26-
create-args: >-
27-
conda-build
28-
boa
29-
- run: conda mambabuild --channel conda-forge --channel scipp --no-anaconda-upload --override-channels --output-folder conda/package conda
30-
31-
- uses: actions/upload-artifact@v4
32-
with:
33-
name: conda-package-noarch
34-
path: conda/package/noarch/*.tar.bz2
35-
3613
build_wheels:
3714
name: Wheels
3815
runs-on: 'ubuntu-24.04'
@@ -60,7 +37,7 @@ jobs:
6037

6138
upload_pypi:
6239
name: Deploy PyPI
63-
needs: [build_wheels, build_conda]
40+
needs: [build_wheels]
6441
runs-on: 'ubuntu-24.04'
6542
environment: release
6643
permissions:
@@ -70,25 +47,8 @@ jobs:
7047
- uses: actions/download-artifact@v4
7148
- uses: pypa/[email protected]
7249

73-
upload_conda:
74-
name: Deploy Conda
75-
needs: [build_wheels, build_conda]
76-
runs-on: 'ubuntu-24.04'
77-
if: github.event_name == 'release' && github.event.action == 'published'
78-
79-
steps:
80-
- uses: actions/download-artifact@v4
81-
- uses: mamba-org/setup-micromamba@v1
82-
with:
83-
environment-name: upload-env
84-
# frozen python due to breaking removal of 'imp' in 3.12
85-
create-args: >-
86-
anaconda-client
87-
python=3.11
88-
- run: anaconda --token ${{ secrets.ANACONDATOKEN }} upload --user scipp --label main $(ls conda-package-noarch/*.tar.bz2)
89-
9050
docs:
91-
needs: [upload_conda, upload_pypi]
51+
needs: [upload_pypi]
9252
uses: ./.github/workflows/docs.yml
9353
with:
9454
publish: ${{ github.event_name == 'release' && github.event.action == 'published' }}

.pre-commit-config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ repos:
1010
- id: check-merge-conflict
1111
- id: check-toml
1212
- id: check-yaml
13-
exclude: conda/meta.yaml
1413
- id: detect-private-key
1514
- id: trailing-whitespace
1615
args: [ --markdown-linebreak-ext=md ]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CODE_OF_CONDUCT.md)
22
[![PyPI badge](http://img.shields.io/pypi/v/essdiffraction.svg)](https://pypi.python.org/pypi/essdiffraction)
3-
[![Anaconda-Server Badge](https://anaconda.org/scipp/essdiffraction/badges/version.svg)](https://anaconda.org/scipp/essdiffraction)
3+
[![Anaconda-Server Badge](https://anaconda.org/conda-forge/essdiffraction/badges/version.svg)](https://anaconda.org/conda-forge/essdiffraction)
44
[![License: BSD 3-Clause](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](LICENSE)
55

66
# ESSdiffraction

conda/meta.yaml

Lines changed: 0 additions & 57 deletions
This file was deleted.

docs/conf.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203
},
204204
{
205205
"name": "Conda",
206-
"url": "https://anaconda.org/scipp/essdiffraction",
206+
"url": "https://anaconda.org/conda-forge/essdiffraction",
207207
"icon": "fa-custom fa-anaconda",
208208
"type": "fontawesome",
209209
},
@@ -287,7 +287,8 @@ def do_not_plot(*args, **kwargs):
287287
"https://www.sciencedirect.com/science/article/pii/S2773183922000374",
288288
# Linkcheck seems to be denied access by some DOI resolvers.
289289
# Since DOIs are supposed to be permanent, we don't need to check them.'
290-
r'https://doi\.org/',
290+
r'https?://doi\.org/',
291+
r'https?://dx\.doi\.org/',
291292
]
292293

293294
# -- Options for bibtex ---------------------------------------------------

docs/user-guide/installation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pip install essdiffraction
1010
````
1111
````{tab-item} conda
1212
```sh
13-
conda install -c conda-forge -c scipp essdiffraction
13+
conda install -c conda-forge essdiffraction
1414
```
1515
````
1616
`````

requirements/docs.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ accessible-pygments==0.0.5
1010
# via pydata-sphinx-theme
1111
alabaster==1.0.0
1212
# via sphinx
13+
appnope==0.1.4
14+
# via ipykernel
1315
attrs==25.3.0
1416
# via
1517
# jsonschema

0 commit comments

Comments
 (0)