Skip to content

Commit 1ec105b

Browse files
authored
Merge pull request #42 from scipp/make-namespace-package
Make namespace package and apply copier update
2 parents 88b9e08 + 1c9ef61 commit 1ec105b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+151
-129
lines changed

.copier-answers.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
2-
_commit: 713c40f
2+
_commit: '2955216'
33
_src_path: gh:scipp/copier_template
44
description: Reflectometry data reduction for the European Spallation Source
55
max_python: '3.12'
66
min_python: '3.10'
7-
namespace_package: ''
7+
namespace_package: ess
88
nightly_deps: plopp,sciline,scippneutron,scippnexus,scipp
99
orgname: scipp
1010
prettyname: ESSreflectometry
1111
projectname: essreflectometry
1212
related_projects: Scipp,ScippNexus,ScippNeutron,Sciline,Plopp
13-
year: 2023
13+
year: 2024

.github/workflows/ci.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# SPDX-License-Identifier: BSD-3-Clause
2-
# Copyright (c) 2023 Scipp contributors (https://github.com/scipp)
3-
41
name: CI
52

63
on:
@@ -24,13 +21,13 @@ jobs:
2421
run: |
2522
echo "min_python=$(cat .github/workflows/python-version-ci)" >> $GITHUB_OUTPUT
2623
echo "min_tox_env=py$(cat .github/workflows/python-version-ci | sed 's/\.//g')" >> $GITHUB_OUTPUT
27-
- uses: actions/setup-python@v4
24+
- uses: actions/setup-python@v5
2825
with:
2926
python-version-file: '.github/workflows/python-version-ci'
3027
- uses: pre-commit/[email protected]
3128
with:
3229
extra_args: --all-files
33-
- uses: pre-commit-ci/[email protected].1
30+
- uses: pre-commit-ci/[email protected].2
3431
if: always()
3532
with:
3633
msg: Apply automatic formatting

.github/workflows/docs.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# SPDX-License-Identifier: BSD-3-Clause
2-
# Copyright (c) 2023 Scipp contributors (https://github.com/scipp)
3-
41
name: Docs
52

63
on:
@@ -47,11 +44,11 @@ jobs:
4744
runs-on: 'ubuntu-22.04'
4845
steps:
4946
- run: sudo apt install --yes graphviz pandoc
50-
- uses: actions/checkout@v3
47+
- uses: actions/checkout@v4
5148
with:
5249
ref: ${{ inputs.branch == '' && github.ref_name || inputs.branch }}
5350
fetch-depth: 0 # history required so cmake can determine version
54-
- uses: actions/setup-python@v4
51+
- uses: actions/setup-python@v5
5552
with:
5653
python-version-file: '.github/workflows/python-version-ci'
5754
- run: python -m pip install --upgrade pip
@@ -62,12 +59,12 @@ jobs:
6259
if: ${{ inputs.version == '' }}
6360
- run: tox -e linkcheck
6461
if: ${{ inputs.linkcheck }}
65-
- uses: actions/upload-artifact@v3
62+
- uses: actions/upload-artifact@v4
6663
with:
6764
name: docs_html
6865
path: html/
6966

70-
- uses: JamesIves/github-pages-deploy-action@v4.4.3
67+
- uses: JamesIves/github-pages-deploy-action@v4.5.0
7168
if: ${{ inputs.publish }}
7269
with:
7370
branch: gh-pages

.github/workflows/nightly_at_main.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# SPDX-License-Identifier: BSD-3-Clause
2-
# Copyright (c) 2023 Scipp contributors (https://github.com/scipp)
3-
41
name: Nightly test at main branch
52

63
on:

.github/workflows/nightly_at_release.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# SPDX-License-Identifier: BSD-3-Clause
2-
# Copyright (c) 2023 Scipp contributors (https://github.com/scipp)
3-
41
name: Nightly tests at latest release
52

63
on:

.github/workflows/release.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# SPDX-License-Identifier: BSD-3-Clause
2-
# Copyright (c) 2023 Scipp contributors (https://github.com/scipp)
3-
41
name: Release
52

63
on:
@@ -18,7 +15,7 @@ jobs:
1815
runs-on: 'ubuntu-22.04'
1916

2017
steps:
21-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
2219
with:
2320
submodules: true
2421
fetch-depth: 0 # history required so setuptools_scm can determine version
@@ -31,7 +28,7 @@ jobs:
3128
boa
3229
- run: conda mambabuild --channel conda-forge --channel scipp --no-anaconda-upload --override-channels --output-folder conda/package conda
3330

34-
- uses: actions/upload-artifact@v3
31+
- uses: actions/upload-artifact@v4
3532
with:
3633
name: conda-package-noarch
3734
path: conda/package/noarch/*.tar.bz2
@@ -41,11 +38,11 @@ jobs:
4138
runs-on: 'ubuntu-22.04'
4239

4340
steps:
44-
- uses: actions/checkout@v3
41+
- uses: actions/checkout@v4
4542
with:
4643
fetch-depth: 0 # history required so setuptools_scm can determine version
4744

48-
- uses: actions/setup-python@v4
45+
- uses: actions/setup-python@v5
4946
with:
5047
python-version-file: '.github/workflows/python-version-ci'
5148

@@ -56,7 +53,7 @@ jobs:
5653
run: python -m build
5754

5855
- name: Upload wheels
59-
uses: actions/upload-artifact@v3
56+
uses: actions/upload-artifact@v4
6057
with:
6158
name: dist
6259
path: dist
@@ -71,7 +68,7 @@ jobs:
7168
if: github.event_name == 'release' && github.event.action == 'published'
7269
steps:
7370
- uses: actions/download-artifact@v3
74-
- uses: pypa/[email protected].10
71+
- uses: pypa/[email protected].14
7572

7673
upload_conda:
7774
name: Deploy Conda

.github/workflows/test.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# SPDX-License-Identifier: BSD-3-Clause
2-
# Copyright (c) 2023 Scipp contributors (https://github.com/scipp)
3-
41
name: Test
52

63
on:
@@ -48,16 +45,16 @@ jobs:
4845
runs-on: ${{ inputs.os-variant }}
4946

5047
steps:
51-
- uses: actions/checkout@v3
48+
- uses: actions/checkout@v4
5249
with:
5350
ref: ${{ inputs.checkout_ref }}
54-
- uses: actions/setup-python@v3
51+
- uses: actions/setup-python@v5
5552
with:
5653
python-version: ${{ inputs.python-version }}
5754
- run: python -m pip install --upgrade pip
5855
- run: python -m pip install -r ${{ inputs.pip-recipe }}
5956
- run: tox -e ${{ inputs.tox-env }}
60-
- uses: actions/upload-artifact@v3
57+
- uses: actions/upload-artifact@v4
6158
if: ${{ inputs.coverage-report }}
6259
with:
6360
name: CoverageReport

.github/workflows/unpinned.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# SPDX-License-Identifier: BSD-3-Clause
2-
# Copyright (c) 2023 Scipp contributors (https://github.com/scipp)
3-
41
name: Unpinned tests at latest release
52

63
on:

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BSD 3-Clause License
22

3-
Copyright (c) 2023, Scipp contributors (https://github.com/scipp)
3+
Copyright (c) 2024, Scipp contributors (https://github.com/scipp)
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without

conda/meta.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ requirements:
2525

2626
test:
2727
imports:
28-
- essreflectometry
28+
- ess.reflectometry
29+
- ess.amor
2930
requires:
3031
- pytest
3132
source_files:

0 commit comments

Comments
 (0)