Skip to content

Commit

Permalink
Merge branch 'main' into feature/gaze-from-eyelink-asc
Browse files Browse the repository at this point in the history
  • Loading branch information
dkrako authored Oct 10, 2023
2 parents 4914f4d + 78b649c commit db5cf6a
Show file tree
Hide file tree
Showing 6 changed files with 136 additions and 72 deletions.
72 changes: 72 additions & 0 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name-template: pymovements $RESOLVED_VERSION

version-resolver:
minor:
labels:
- deprecation
- enhancement
- breaking
default: patch

categories:
- title: 🏆 Highlights
labels: highlight
- title: 💥 Breaking Changes
labels: breaking
- title: ⚠️ Deprecations
labels: deprecation
- title: ✨ Enhancements
labels: enhancement
- title: 🐞 Bug Fixes
labels: fix
- title: 🛠️ Maintenance
labels:
- build
- internal
- docs

exclude-labels:
- skip changelog

exclude-contributors:
- pre-commit-ci

change-template: '- $TITLE (#$NUMBER)'
change-title-escapes: '\<*_&'
replacers:
# Remove conventional commits from titles
- search: '/- (build|chore|ci|depr|docs|feat|fix|perf|refactor|release|test)(\(.*\))?(\!)?\: /g'
replace: '- '

autolabeler:
- label: breaking
title:
# Example: feat!: ...
- '/^(build|chore|ci|depr|docs|feat|fix|perf|refactor|release|test)(\(.*\))?\!\: /'
- label: build
title:
- '/^build/'
- label: internal
title:
- '/^(chore|ci|perf|refactor|test)/'
- label: deprecation
title:
- '/^depr/'
- label: documentation
title:
- '/^docs/'
- label: enhancement
title:
- '/^feat/'
- label: fix
title:
- '/^fix/'
- label: release
title:
- '/^release/'

template: |
$CHANGES
Shoutout to all our contributors for making this release possible!
$CONTRIBUTORS
41 changes: 0 additions & 41 deletions .github/workflows/docs.yml

This file was deleted.

25 changes: 0 additions & 25 deletions .github/workflows/pylint.yml

This file was deleted.

55 changes: 54 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
test:
name: ${{ matrix.tox_env }} / ${{ matrix.os }}
name: test ${{ matrix.tox_env }} (${{ matrix.os }})
runs-on: ${{ matrix.os }}
env:
MPLBACKEND: Agg
Expand Down Expand Up @@ -52,3 +52,56 @@ jobs:
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}

pylint:
name: pylint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Install base python for tox
uses: actions/setup-python@v4
with:
python-version: "3.9"
- name: Install tox
run: python -m pip install tox
- name: Setup test environment
run: tox -vv --notest -e pylint
- name: Run test
run: tox --skip-pkg-install -e pylint


docs:
name: docs (${{ matrix.os }})
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os:
- macos-latest
- ubuntu-latest
- windows-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Install pandoc
uses: r-lib/actions/setup-pandoc@v2
with:
pandoc-version: '2.19.2'
- name: Install base python for tox
uses: actions/setup-python@v4
with:
python-version: "3.9"
- name: Install tox
run: python -m pip install tox
- name: Setup test environment
run: tox -vv --notest -e docs
- name: Run test
run: tox --skip-pkg-install -e docs
- name: Upload documentation
uses: actions/upload-artifact@v3
with:
name: html-docs-${{ matrix.os }}
path: docs/build/
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ repos:
hooks:
- id: add-trailing-comma
- repo: https://github.com/asottile/pyupgrade
rev: v3.14.0
rev: v3.15.0
hooks:
- id: pyupgrade
args: [--py39-plus]
Expand All @@ -32,7 +32,7 @@ repos:
exclude: __init__.py
args: [--application-directories=src, --add-import, 'from __future__ import annotations']
- repo: https://github.com/datarootsio/databooks
rev: 1.3.9
rev: 1.3.10
hooks:
- id: databooks-meta
args: [--cell-fields-keep=id]
Expand Down Expand Up @@ -70,7 +70,7 @@ repos:
- id: mypy
additional_dependencies: [types-all, pandas-stubs, types-tqdm]
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: check-builtin-literals
- id: check-case-conflict
Expand Down Expand Up @@ -114,7 +114,7 @@ repos:
'--ignore=D103,D213',
]
- repo: https://github.com/PyCQA/pylint
rev: v3.0.0
rev: v3.0.1
hooks:
- id: pylint
name: pylint
Expand Down
7 changes: 6 additions & 1 deletion src/pymovements/datasets/toy_dataset_eyelink.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,11 @@ class ToyDatasetEyeLink(DatasetDefinition):
'value': None,
},
],
'schema': {'trial_id': pl.Int64},
'schema': {
'trial_id': pl.Int64,
'screen_id': pl.Int64,
'point_id': pl.Int64,
'task': pl.Utf8,
},
},
)

0 comments on commit db5cf6a

Please sign in to comment.