Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: pupil-labs/pupil
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.3.7.2
Choose a base ref
...
head repository: pupil-labs/pupil
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing 461 changed files with 64,360 additions and 21,177 deletions.
95 changes: 95 additions & 0 deletions .github/workflows/bundle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
name: Bundle Pupil Core

on:
push:
tags:
- "**"
workflow_dispatch:
inputs:
notarize_on_macos:
description: 'Notarize on macOS'
required: true
type: boolean

jobs:
Bundle:
name: Bundle ${{ matrix.platform }}
strategy:
fail-fast: False
matrix:
platform:
- windows-latest
- macOS-11
- ubuntu-18.04
runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: "3.11"
- name: Install Pupil Core dependencies
env:
ARCHFLAGS: "-arch x86_64"
run: |
python -m pip install -U pip wheel
python -m pip install -r requirements.txt -r requirements-bundle.txt
- name: Install Linux-specific dependencies
if: runner.os == 'Linux'
run: sudo apt-get install libportaudio2
- name: Bundle on Windows
if: runner.os == 'Windows'
run: .\reproducible_build.ps1
shell: powershell
working-directory: deployment
- name: Import macOS codesign certificates
if: runner.os == 'macOS'
uses: apple-actions/import-codesign-certs@v1
with:
p12-file-base64: ${{ secrets.MACOS_CERTIFICATE }}
p12-password: ${{ secrets.MACOS_CERTIFICATE_PWD }}
- name: Bundle on Unix
if: runner.os != 'Windows'
run: ./reproducible_build.sh
working-directory: deployment
env:
MACOS_SHOULD_SIGN_AND_NOTARIZE: >
${{
inputs.notarize_on_macos ||
(github.event_name == 'push' && contains(github.ref, 'refs/tags/'))
}}
MACOS_CODESIGN_IDENTITY: ${{ secrets.MACOS_CODESIGN_IDENTITY }}
MACOS_NOTARYTOOL_APPLE_ID: ${{ secrets.MACOS_NOTARYTOOL_APPLE_ID }}
MACOS_NOTARYTOOL_TEAM_ID: ${{ secrets.MACOS_NOTARYTOOL_TEAM_ID }}
MACOS_NOTARYTOOL_APPSPECIFIC_PASSWORD: ${{ secrets.MACOS_NOTARYTOOL_APPSPECIFIC_PASSWORD }}
- name: Upload build as artifact
uses: actions/upload-artifact@v3
if: always()
with:
name: bundle-${{ matrix.platform }}
path: |
deployment/*.rar
deployment/*.app
deployment/*.dmg
deployment/*.json
deployment/*.zip
draft_release:
name: Draft Github release
needs: Bundle
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
runs-on: ubuntu-latest
steps:
- name: Download build artifacts
uses: actions/download-artifact@v3
- name: Create Github release draft
uses: softprops/action-gh-release@v1
with:
files: |
*.rar
*.dmg
*.zip
draft: true
name: Pupil Capture, Player, and Service release
38 changes: 36 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -6,13 +6,24 @@ Thumbs.db
*.pyc
*.pstats

# object files #
*.o

# binaries #
*.so
*.o

#cython build files
*.c

# user generated files will be ignored if in directory named 'recordings...' #
# user generated settings files will also be ignored #
recordings/
settings/
recordings
capture_settings/
service_settings/
player_settings/
settings/
*.db
*.npy
*.png
@@ -21,7 +32,30 @@ player_settings/

# IDE generated files #
.floo
.sublime-project
.flooignore
*.sublime-project
*.sublime-workspace
.vscode
.idea
#directory for test file will be ignored
Pupil_Test_Files
*.mkv
*.egg-info
hmd_cal_data

mprofile_*.dat
.ipynb_checkpoints/
*.dmg
*.zip
deployment/pupil_v*
deployment/build/
deployment/dist/
*.pyd
*.dll
win_drv
.vs
.venv*

# pyenv local config
.python-version
*.exe
39 changes: 39 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: check-added-large-files
- id: check-ast
- id: check-toml
- id: check-case-conflict
- id: check-merge-conflict
- id: check-yaml
- id: debug-statements
- id: mixed-line-ending

- repo: https://github.com/psf/black
rev: 23.3.0
hooks:
- id: black

- repo: https://github.com/asottile/pyupgrade
rev: v3.3.1
hooks:
- id: pyupgrade
name: PyUpgrade 3.6+
args: ["--py36-plus"]
exclude: ^bin/

- repo: https://github.com/PyCQA/isort
rev: 5.12.0
hooks:
- id: isort
args: [--profile, black]

- repo: https://github.com/asottile/setup-cfg-fmt
rev: v2.2.0
hooks:
- id: setup-cfg-fmt
Loading