Skip to content

Commit 7019446

Browse files
authored
Merge pull request #2162 from pupil-labs/develop
Pupil v3.4 Release Candidate 1
2 parents 91b7732 + 3f9be43 commit 7019446

57 files changed

Lines changed: 1341 additions & 235 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/black-check.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

.pre-commit-config.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
repos:
2+
- repo: https://github.com/pre-commit/pre-commit-hooks
3+
rev: v3.2.0
4+
hooks:
5+
- id: trailing-whitespace
6+
- id: end-of-file-fixer
7+
- id: check-yaml
8+
- id: check-added-large-files
9+
- id: check-ast
10+
- id: check-toml
11+
12+
- repo: https://github.com/psf/black
13+
rev: 20.8b1
14+
hooks:
15+
- id: black

.travis.yml

Lines changed: 0 additions & 36 deletions
This file was deleted.

.travis/run_tests.sh

Lines changed: 0 additions & 9 deletions
This file was deleted.

COPYING

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,4 +671,4 @@ into proprietary programs. If your program is a subroutine library, you
671671
may consider it more useful to permit linking proprietary applications with
672672
the library. If this is what you want to do, use the GNU Lesser General
673673
Public License instead of this License. But first, please read
674-
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
674+
<http://www.gnu.org/philosophy/why-not-lgpl.html>.

COPYING.LESSER

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,4 +162,4 @@ General Public License ever published by the Free Software Foundation.
162162
whether future versions of the GNU Lesser General Public License shall
163163
apply, that proxy's public statement of acceptance of any version is
164164
permanent authorization for you to choose that version for the
165-
Library.
165+
Library.

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Pupil
2-
<a
2+
<a
33
href="https://pupil-labs.com"
44
rel="noopener"
55
target="_blank">
66
<p align="center">
7-
<img
8-
src="https://raw.githubusercontent.com/wiki/pupil-labs/pupil/media/images/pupil_labs_pupil_core_repo_banner.jpg"
7+
<img
8+
src="https://raw.githubusercontent.com/wiki/pupil-labs/pupil/media/images/pupil_labs_pupil_core_repo_banner.jpg"
99
alt="Pupil Labs - Pupil Core software: open source eye tracking platform."/>
1010
</p>
1111
</a>
@@ -19,27 +19,27 @@ Our vision is to create tools for a diverse group of people interested in learni
1919
Chat with us on [Discord](https://pupil-labs.com/chat "Pupil Server on Discord").
2020

2121
## Users
22-
<a
22+
<a
2323
href="https://github.com/pupil-labs/pupil/releases/latest#user-content-downloads"
2424
rel="noopener"
2525
target="_blank">
2626
<p align="center">
27-
<img
28-
src="https://raw.githubusercontent.com/wiki/pupil-labs/pupil/media/images/pupil_labs_pupil_core_app_download_banner.png"
27+
<img
28+
src="https://raw.githubusercontent.com/wiki/pupil-labs/pupil/media/images/pupil_labs_pupil_core_app_download_banner.png"
2929
alt="Download the latest Pupil Core Apps: Pupil Capture, Pupil Player, Pupil Service"/>
3030
</p>
3131
</a>
3232

3333

34-
You don't need to know how to write code to _use_ Pupil. [Download the latest apps](https://github.com/pupil-labs/pupil/releases/latest#user-content-downloads "Download Pupil Capture, Pupil Player, and Pupil Service application bundles")!
34+
You don't need to know how to write code to _use_ Pupil. [Download the latest apps](https://github.com/pupil-labs/pupil/releases/latest#user-content-downloads "Download Pupil Capture, Pupil Player, and Pupil Service application bundles")!
3535

36-
Read the [Pupil Core user guide](https://docs.pupil-labs.com/core/ "Pupil Core user guide").
36+
Read the [Pupil Core user guide](https://docs.pupil-labs.com/core/ "Pupil Core user guide").
3737

3838
## Developers
3939
There are a number of ways you can interact with Pupil Core software as a developer:
4040

41-
- [Use the API](https://docs.pupil-labs.com/developer/core/network-api/): Use the network based real-time API to communicate with Pupil over the network and integrate with your application.
42-
- [Develop a Plugin](https://docs.pupil-labs.com/developer/core/plugin-api/): Plugins are loaded at runtime from the app bundle. Note: if your plugin requires Python libraries that are not included in the application bundle, then you will need to run from source.
41+
- [Use the API](https://docs.pupil-labs.com/developer/core/network-api/): Use the network based real-time API to communicate with Pupil over the network and integrate with your application.
42+
- [Develop a Plugin](https://docs.pupil-labs.com/developer/core/plugin-api/): Plugins are loaded at runtime from the app bundle. Note: if your plugin requires Python libraries that are not included in the application bundle, then you will need to run from source.
4343
- [Run from Source](#installing-dependencies): Can't do what you need to do with the network based api or plugin? Then get ready to dive into the inner workings of Pupil and run from source!
4444

4545
All setup and dependency installation instructions are contained in this repo. All other developer documentation is [here](https://docs.pupil-labs.com/developer/core/overview/ "Pupil Core developer docs").

deployment/bundle_windows.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@echo off
22
title Pupil Bundle Procedure
3-
setlocal enableextensions
3+
setlocal enableextensions
44

55
goto :MAIN
66

@@ -44,4 +44,4 @@ call :Bundle player %current_tag%
4444
python generate_msi_installer.py
4545
rar a %release_dir%.msi.rar %release_dir%.msi
4646

47-
exit /B 0
47+
exit /B 0

deployment/create_icns.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
## Create `.icns` and `.ico` files
22
- Go to: http://iconverticons.com/online/ to convert .svg to `.icns` and `.ico` files
3-
- For `.icns` select `icns file` (not `finder ready`).
3+
- For `.icns` select `icns file` (not `finder ready`).
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# pyinstaller #
22
dist/
3-
build/
3+
build/

0 commit comments

Comments
 (0)