From dbd6d7ff9b3dbbdcbed8182031d092af206640e9 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 20:07:08 +0000 Subject: [PATCH 1/4] ci: pre-commit autoupdate (#600) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/asottile/pyupgrade: v3.14.0 → v3.15.0](https://github.com/asottile/pyupgrade/compare/v3.14.0...v3.15.0) - [github.com/datarootsio/databooks: 1.3.9 → 1.3.10](https://github.com/datarootsio/databooks/compare/1.3.9...1.3.10) - [github.com/pre-commit/pre-commit-hooks: v4.4.0 → v4.5.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.4.0...v4.5.0) - [github.com/PyCQA/pylint: v3.0.0 → v3.0.1](https://github.com/PyCQA/pylint/compare/v3.0.0...v3.0.1) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 439c33583..a444435d3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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] @@ -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] @@ -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 @@ -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 From 6e43d0dc1418f0fd8c998e44cca8b846df1a00a6 Mon Sep 17 00:00:00 2001 From: "Daniel G. Krakowczyk" Date: Tue, 10 Oct 2023 09:09:31 +0200 Subject: [PATCH 2/4] ci: revert refactor GitHub workflows (#596) This reverts commit 43c75cac077f44b982a205cbdfefc29184fad07b. --- .github/workflows/docs.yml | 41 --------------------------- .github/workflows/pylint.yml | 25 ---------------- .github/workflows/tests.yml | 55 +++++++++++++++++++++++++++++++++++- 3 files changed, 54 insertions(+), 67 deletions(-) delete mode 100644 .github/workflows/docs.yml delete mode 100644 .github/workflows/pylint.yml diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml deleted file mode 100644 index 86cdbdd4f..000000000 --- a/.github/workflows/docs.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: docs -on: - push: - branches: [main] - pull_request: - branches: [main] - -jobs: - docs: - name: ${{ 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/ diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml deleted file mode 100644 index ee3d97c2c..000000000 --- a/.github/workflows/pylint.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: pylint -on: - push: - branches: [main] - pull_request: - branches: [main] - -jobs: - 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 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 357001799..be8fe2285 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -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 @@ -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/ From 61244a11e0145bdb58994e2ea26d2a89de64dcc5 Mon Sep 17 00:00:00 2001 From: "Daniel G. Krakowczyk" Date: Tue, 10 Oct 2023 09:44:26 +0200 Subject: [PATCH 3/4] ci: create release-drafter.yml (#598) --- .github/release-drafter.yml | 72 +++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 .github/release-drafter.yml diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml new file mode 100644 index 000000000..96d447033 --- /dev/null +++ b/.github/release-drafter.yml @@ -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 From 78b649cd52c1815d422eca86ebf2c76d14935b90 Mon Sep 17 00:00:00 2001 From: "Daniel G. Krakowczyk" Date: Tue, 10 Oct 2023 10:21:16 +0200 Subject: [PATCH 4/4] fix: specify schema for ToyDatasetEyeLink (#601) --- src/pymovements/datasets/toy_dataset_eyelink.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pymovements/datasets/toy_dataset_eyelink.py b/src/pymovements/datasets/toy_dataset_eyelink.py index 11a7b4fa0..67f191838 100644 --- a/src/pymovements/datasets/toy_dataset_eyelink.py +++ b/src/pymovements/datasets/toy_dataset_eyelink.py @@ -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, + }, }, )