Skip to content

Commit

Permalink
Merge pull request #183 from scipp/drop-py38
Browse files Browse the repository at this point in the history
Drop Python 3.8
  • Loading branch information
SimonHeybrock authored Dec 7, 2023
2 parents 01aaa97 + f574ba9 commit 2f7a6b9
Show file tree
Hide file tree
Showing 46 changed files with 355 additions and 373 deletions.
5 changes: 3 additions & 2 deletions .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
_commit: 13cf3e6
_commit: ec09f73
_src_path: gh:scipp/copier_template
description: An h5py-like utility for NeXus files with seamless Scipp integration
max_python: '3.12'
min_python: '3.8'
min_python: '3.9'
namespace_package: ''
nightly_deps: scipp
orgname: scipp
prettyname: ScippNexus
projectname: scippnexus
related_projects: Scipp,ScippNeutron
year: 2023
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:
formatting:
name: Formatting and static analysis
runs-on: 'ubuntu-20.04'
runs-on: 'ubuntu-22.04'
outputs:
min_python: ${{ steps.vars.outputs.min_python }}
min_tox_env: ${{ steps.vars.outputs.min_tox_env }}
Expand All @@ -39,7 +39,7 @@ jobs:
needs: formatting
strategy:
matrix:
os: ['ubuntu-20.04']
os: ['ubuntu-22.04']
python:
- version: '${{needs.formatting.outputs.min_python}}'
tox-env: '${{needs.formatting.outputs.min_tox_env}}'
Expand All @@ -54,4 +54,5 @@ jobs:
uses: ./.github/workflows/docs.yml
with:
publish: false
linkcheck: ${{ contains(matrix.variant.os, 'ubuntu') && github.ref == 'refs/heads/main' }}
branch: ${{ github.head_ref == '' && github.ref_name || github.head_ref }}
10 changes: 8 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,19 @@ on:
default: ''
required: false
type: string
linkcheck:
description: 'Run the link checker. If not set the link checker will not be run.'
default: false
required: false
type: boolean

env:
VERSION: ${{ inputs.version }}

jobs:
docs:
name: Build documentation
runs-on: 'ubuntu-20.04'
runs-on: 'ubuntu-22.04'
steps:
- run: sudo apt install --yes graphviz pandoc
- uses: actions/checkout@v3
Expand All @@ -55,6 +60,8 @@ jobs:
if: ${{ inputs.version != '' }}
- run: tox -e docs
if: ${{ inputs.version == '' }}
- run: tox -e linkcheck
if: ${{ inputs.linkcheck }}
- uses: actions/upload-artifact@v3
with:
name: docs_html
Expand All @@ -66,4 +73,3 @@ jobs:
branch: gh-pages
folder: html
single-commit: true
ssh-key: ${{ secrets.GH_PAGES_DEPLOY_KEY }}
4 changes: 2 additions & 2 deletions .github/workflows/nightly_at_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
setup:
name: Setup variables
runs-on: 'ubuntu-20.04'
runs-on: 'ubuntu-22.04'
outputs:
min_python: ${{ steps.vars.outputs.min_python }}
steps:
Expand All @@ -25,7 +25,7 @@ jobs:
needs: setup
strategy:
matrix:
os: ['ubuntu-20.04']
os: ['ubuntu-22.04']
python:
- version: '${{needs.setup.outputs.min_python}}'
tox-env: 'nightly'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly_at_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
setup:
name: Setup variables
runs-on: 'ubuntu-20.04'
runs-on: 'ubuntu-22.04'
outputs:
min_python: ${{ steps.vars.outputs.min_python }}
release_tag: ${{ steps.release.outputs.release_tag }}
Expand All @@ -31,7 +31,7 @@ jobs:
needs: setup
strategy:
matrix:
os: ['ubuntu-20.04']
os: ['ubuntu-22.04']
python:
- version: '${{needs.setup.outputs.min_python}}'
tox-env: 'nightly'
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.8
3.9
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ defaults:
jobs:
build_conda:
name: Conda build
runs-on: 'ubuntu-20.04'
runs-on: 'ubuntu-22.04'

steps:
- uses: actions/checkout@v3
Expand All @@ -38,7 +38,7 @@ jobs:

build_wheels:
name: Wheels
runs-on: 'ubuntu-20.04'
runs-on: 'ubuntu-22.04'

steps:
- uses: actions/checkout@v3
Expand All @@ -64,7 +64,7 @@ jobs:
upload_pypi:
name: Deploy PyPI
needs: [build_wheels, build_conda]
runs-on: 'ubuntu-20.04'
runs-on: 'ubuntu-22.04'
environment: release
permissions:
id-token: write
Expand All @@ -76,7 +76,7 @@ jobs:
upload_conda:
name: Deploy Conda
needs: [build_wheels, build_conda]
runs-on: 'ubuntu-20.04'
runs-on: 'ubuntu-22.04'
if: github.event_name == 'release' && github.event.action == 'published'

steps:
Expand All @@ -100,7 +100,7 @@ jobs:
assets:
name: Upload docs
needs: docs
runs-on: 'ubuntu-20.04'
runs-on: 'ubuntu-22.04'
permissions:
contents: write # This is needed so that the action can upload the asset
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
workflow_dispatch:
inputs:
os-variant:
default: 'ubuntu-20.04'
default: 'ubuntu-22.04'
type: string
python-version:
type: string
Expand All @@ -26,7 +26,7 @@ on:
workflow_call:
inputs:
os-variant:
default: 'ubuntu-20.04'
default: 'ubuntu-22.04'
type: string
python-version:
type: string
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unpinned.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
setup:
name: Setup variables
runs-on: 'ubuntu-20.04'
runs-on: 'ubuntu-22.04'
outputs:
min_python: ${{ steps.vars.outputs.min_python }}
release_tag: ${{ steps.release.outputs.release_tag }}
Expand All @@ -31,7 +31,7 @@ jobs:
needs: setup
strategy:
matrix:
os: ['ubuntu-20.04']
os: ['ubuntu-22.04']
python:
- version: '${{needs.setup.outputs.min_python}}'
tox-env: 'unpinned'
Expand Down
27 changes: 24 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
# Build artifacts
build
dist
html
.tox
src/scippnexus.egg-info
*.egg-info

*.sw?

# Environments
venv

# Caches
.clangd/
.idea/
.vscode/
*.ipynb_checkpoints
__pycache__/
.vs/
Expand All @@ -16,3 +20,20 @@ __pycache__/
.pytest_cache
.mypy_cache
docs/generated/

# Editor settings
.idea/
.vscode/

# Data files
*.data
*.dat
*.csv
*.xye
*.h5
*.hdf5
*.hdf
*.nxs
*.raw
*.cif
*.rcif
16 changes: 8 additions & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v4.5.0
hooks:
- id: check-added-large-files
- id: check-json
exclude: asv.conf.json
- id: check-merge-conflict
- id: check-toml
- id: check-yaml
exclude: conda/meta.yaml
Expand All @@ -18,7 +19,7 @@ repos:
- id: isort
name: isort (python)
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 23.9.0
rev: 23.11.0
hooks:
- id: black
- repo: https://github.com/kynan/nbstripout
Expand All @@ -29,28 +30,27 @@ repos:
args: [ "--drop-empty-cells",
"--extra-keys 'metadata.language_info.version cell.metadata.jp-MarkdownHeadingCollapsed cell.metadata.pycharm'" ]
- repo: https://github.com/pycqa/flake8
rev: 4.0.1
rev: 6.1.0
hooks:
- id: flake8
types: ["python"]
additional_dependencies: ["flake8-bugbear==22.10.27"]
additional_dependencies: ["flake8-bugbear==23.9.16"]
- repo: https://github.com/pycqa/bandit
rev: 1.7.4
rev: 1.7.5
hooks:
- id: bandit
additional_dependencies: ["bandit[toml]"]
args: ["-c", "pyproject.toml"]
- repo: https://github.com/codespell-project/codespell
rev: v2.2.2
rev: v2.2.6
hooks:
- id: codespell
additional_dependencies:
- tomli
- repo: https://github.com/pre-commit/pygrep-hooks
rev: v1.9.0
rev: v1.10.0
hooks:
- id: python-no-eval
exclude: "object_list.py"
- id: python-no-log-warn
- id: python-use-type-annotations
- id: rst-backticks
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
## Contributing to Scippnexus
## Contributing to ScippNexus

Welcome to the developer side of Scippnexus!
Welcome to the developer side of ScippNexus!

Contributions are always welcome.
This includes reporting bugs or other issues, submitting pull requests, requesting new features, etc.

If you need help with using Scippnexus or contributing to it, have a look at the GitHub [discussions](https://github.com/scipp/scippnexus/discussions) and start a new [Q&A discussion](https://github.com/scipp/scippnexus/discussions/categories/q-a) if you can't find what you are looking for.
If you need help with using ScippNexus or contributing to it, have a look at the GitHub [discussions](https://github.com/scipp/scippnexus/discussions) and start a new [Q&A discussion](https://github.com/scipp/scippnexus/discussions/categories/q-a) if you can't find what you are looking for.

For bug reports and other problems, please open an [issue](https://github.com/scipp/scippnexus/issues/new) in GitHub.

You are welcome to submit pull requests at any time.
But to avoid having to make large modifications during review or even have your PR rejected, please first open an issue first to discuss your idea!

Check out the subsections of the [Developer documentation](https://scipp.github.io/scippnexus/developer/index.html) for details on how Scippnexus is developed.
Check out the subsections of the [Developer documentation](https://scipp.github.io/scippnexus/developer/index.html) for details on how ScippNexus is developed.

## Code of conduct

Expand Down
4 changes: 2 additions & 2 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ requirements:
- setuptools
- setuptools_scm
run:
- python>=3.8
- python>=3.9
- python-dateutil
- scipp>=23.07.0
- scipy
Expand All @@ -31,7 +31,7 @@ test:
build:
noarch: python
script:
- pip install .
- python -m pip install .

about:
home: https://github.com/scipp/scippnexus
Expand Down
13 changes: 13 additions & 0 deletions docs/_static/anaconda-icon.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2f7a6b9

Please sign in to comment.