Skip to content

Commit 5443115

Browse files
authored
Merge pull request #145 from scipp/copier-update
copier update
2 parents 2e4ec65 + a223c8c commit 5443115

File tree

10 files changed

+59
-15
lines changed

10 files changed

+59
-15
lines changed

.copier-answers.ess.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
2-
_commit: 0951a4b
2+
_commit: d1d5caa
33
_src_path: https://github.com/scipp/ess_template.git

.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: d704227
2+
_commit: d3d4dc7
33
_src_path: gh:scipp/copier_template
44
description: Reflectometry data reduction for the European Spallation Source
55
max_python: '3.13'

.github/ISSUE_TEMPLATE/blank.md

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

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
path: html/
7272
- run: echo "::notice::https://remote-unzip.deno.dev/${{ github.repository }}/artifacts/${{ steps.artifact-upload-step.outputs.artifact-id }}"
7373

74-
- uses: JamesIves/[email protected].2
74+
- uses: JamesIves/[email protected].3
7575
if: ${{ inputs.publish }}
7676
with:
7777
branch: gh-pages

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
if: github.event_name == 'release' && github.event.action == 'published'
6969
steps:
7070
- uses: actions/download-artifact@v4
71-
- uses: pypa/gh-action-pypi-publish@v1.8.14
71+
- uses: pypa/gh-action-pypi-publish@v1.12.4
7272

7373
upload_conda:
7474
name: Deploy Conda

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ venv
1414
.venv
1515

1616
# Caches
17+
*.DS_Store
1718
.clangd/
1819
*.ipynb_checkpoints
1920
__pycache__/

docs/index.md

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,29 @@
1-
# ESSreflectometry
1+
:::{image} _static/logo.svg
2+
:class: only-light
3+
:alt: ESSreflectometry
4+
:width: 60%
5+
:align: center
6+
:::
7+
:::{image} _static/logo-dark.svg
8+
:class: only-dark
9+
:alt: ESSreflectometry
10+
:width: 60%
11+
:align: center
12+
:::
213

3-
<span style="font-size:1.2em;font-style:italic;color:#5a5a5a">
14+
```{raw} html
15+
<style>
16+
.transparent {display: none; visibility: hidden;}
17+
.transparent + a.headerlink {display: none; visibility: hidden;}
18+
</style>
19+
```
20+
21+
```{role} transparent
22+
```
23+
24+
# {transparent}`ESSreflectometry`
25+
26+
<span style="font-size:1.2em;font-style:italic;color:var(--pst-color-text-muted)">
427
Reflectometry data reduction for the European Spallation Source
528
</br></br>
629
</span>
@@ -22,3 +45,12 @@ api-reference/index
2245
developer/index
2346
about/index
2447
```
48+
49+
:::{include} user-guide/installation.md
50+
:heading-offset: 1
51+
:::
52+
53+
## Get in touch
54+
55+
- If you have questions that are not answered by these documentation pages, ask on [discussions](https://github.com/scipp/essreflectometry/discussions). Please include a self-contained reproducible example if possible.
56+
- Report bugs (including unclear, missing, or wrong documentation!), suggest features or view the source code [on GitHub](https://github.com/scipp/essreflectometry).

docs/user-guide/index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
# User guide
1+
# User Guide
22

33
```{toctree}
44
---
55
maxdepth: 1
66
---
7+
installation
78
amor/index
89
estia/index
910
```

docs/user-guide/installation.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Installation
2+
3+
To install ESSreflectometry and all of its dependencies, use
4+
5+
`````{tab-set}
6+
````{tab-item} pip
7+
```sh
8+
pip install essreflectometry
9+
```
10+
````
11+
````{tab-item} conda
12+
```sh
13+
conda install -c conda-forge -c scipp essreflectometry
14+
```
15+
````
16+
`````

tox.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ description = Update dependencies by running pip-compile-multi
6464
deps =
6565
pip-compile-multi
6666
tomli
67+
# Avoid https://github.com/jazzband/pip-tools/issues/2131
68+
pip==24.2
6769
skip_install = true
6870
changedir = requirements
6971
commands = python ./make_base.py --nightly plopp,sciline,scippneutron,scippnexus,scipp

0 commit comments

Comments
 (0)