Skip to content

Commit

Permalink
Merge branch 'main' into repo_precommit
Browse files Browse the repository at this point in the history
  • Loading branch information
HGWright committed Feb 21, 2024
2 parents 3dd44e3 + 398ba76 commit 59d6213
Show file tree
Hide file tree
Showing 12 changed files with 269 additions and 287 deletions.
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ updates:
schedule:
# Check for updates to GitHub Actions every weekday
interval: "daily"
groups:
dependencies:
patterns:
- "*"
labels:
- "New: Pull Request"
- "Bot"
40 changes: 20 additions & 20 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
'Type: Dependencies':
- '(depende|deps|Deps|Depende)'
- any:
- changed-files:
- any-glob-to-any-file: 'requirements/stratify.yml'
- any-glob-to-any-file: 'requirements/py*.yml'
- any-glob-to-any-file: 'requirements/locks/pypi*.txt'
- any-glob-to-any-file: 'requirements/locks/py*.lock'

'Type: Documentation':
- '(documentation|Docs|Documentation|Docs)'
- any:
changed-files:
- any-glob-to-any-file: 'index.ipynb'
- any-glob-to-any-file: 'README.md'

'Type: GHA':
- '(gha|github action|GHA|Github Action|Github action)'
- any:
- changed-files:
- any-glob-to-any-file: '.github/*.yml'
- any-glob-to-any-file: '.github/**/*.yml'

'Type: Infrastructure':
- '(depende|deps|Deps|Depende|documentation|Docs|Documentation|Docs|gha|github action|GHA|Github Action|Github action|testing|tests|coverage|Testing|Tests|Coverage)'
- any:
changed-files:
- any-glob-to-any-file: '*'

'Type: Testing':
- '(testing|tests|coverage|Testing|Tests|Coverage)'

'Type: Bug':
- '(bug|Bug)'

'Type: Enhancement':
- '(feature|Feature)'

'Type: Performance':
- '(performance|Performance)'

'Type: Tech Debt':
- '(debt|Debt)'

'Type: Question':
- '(question|Question)'
- any:
changed-files:
- any-glob-to-any-file: 'src/stratify/tests/*'
19 changes: 0 additions & 19 deletions .github/pull_request_labeler.yml

This file was deleted.

12 changes: 1 addition & 11 deletions .github/workflows/ci-label.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,17 @@
# Reference
# - https://github.com/actions/labeler
# - https://github.com/github/issue-labeler

name: ci-label

on:
pull_request_target:
types: [opened, edited, reopened]
issues:
types: [opened, edited, reopened]

jobs:
issue_triage:
PR_triage:
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v5
with:
configuration-path: .github/pull_request_labeler.yml
repo-token: ${{ secrets.GITHUB_TOKEN }}

- uses: github/[email protected]
with:
configuration-path: .github/labeler.yml
enable-versioned-regex: 0
include-title: 1
repo-token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/ci-locks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ concurrency:

jobs:
refresh_lockfiles:
uses: scitools/workflows/.github/workflows/refresh-lockfiles.yml@2023.12.1
uses: scitools/workflows/.github/workflows/refresh-lockfiles.yml@2024.02.0
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/ci-manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ concurrency:
jobs:
manifest:
name: "check-manifest"
uses: scitools/workflows/.github/workflows/ci-manifest.yml@2023.12.1
uses: scitools/workflows/.github/workflows/ci-manifest.yml@2024.02.0
2 changes: 1 addition & 1 deletion .github/workflows/ci-wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
fetch-depth: 0

- name: "build ${{ matrix.os }} (${{ matrix.arch }}) wheels"
uses: pypa/[email protected].2
uses: pypa/[email protected].5
env:
CIBW_SKIP: "cp36-* cp37-* cp312-* pp* *-musllinux*"
CIBW_ARCHS: ${{ matrix.arch }}
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ repos:
# Don't commit to master branch.
- id: no-commit-to-branch
- repo: https://github.com/psf/black-pre-commit-mirror
rev: '23.11.0'
rev: '24.2.0'
hooks:
- id: black
types: [file, python]
args: [--config=./pyproject.toml, .]
- repo: https://github.com/PyCQA/flake8
rev: '6.1.0'
rev: '7.0.0'
hooks:
# Run flake8.
- id: flake8
args: [--config=./.flake8]
- repo: https://github.com/pycqa/isort
rev: '5.13.0'
rev: '5.13.2'
hooks:
- id: isort
name: isort (python)
Expand Down
156 changes: 79 additions & 77 deletions requirements/locks/py310-linux-64.lock

Large diffs are not rendered by default.

156 changes: 79 additions & 77 deletions requirements/locks/py311-linux-64.lock

Large diffs are not rendered by default.

156 changes: 79 additions & 77 deletions requirements/locks/py39-linux-64.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/stratify/tests/performance.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Functions that may be used to measure performance of a component.
"""

import dask.array as da
import numpy as np

Expand Down

0 comments on commit 59d6213

Please sign in to comment.