Merge pull request #1814 from pupil-labs/develop

Pupil v1.22 Release

.gitignore

@@ -39,10 +39,6 @@ settings/
 .idea
 #directory for test file will be ignored
 Pupil_Test_Files
-detector_2d.cpp
-detector_3d.cpp
-CircleGoodnessTest.cpp
-SphereCircleTest.cpp
 *.mkv
 *.egg-info
 hmd_cal_data
@@ -55,4 +51,5 @@ deployment/pupil_v*
 *.pyd
 *.dll
 win_drv
-.vs
+.vs
+.venv

README.md

@@ -50,14 +50,6 @@ All setup and dependency installation instructions are contained in this repo. A
 - [macOS](./docs/dependencies-macos.md "Pupil dependency installation for macOS")
 - [Windows 10](./docs/dependencies-windows.md "Pupil dependency installation for Windows 10")
 
-#### Intel RealSense 3D Support
-
-If you want to use an Intel RealSense 3D scene camera, please follow the additional setup instructions for the camera model you have.
-
-* **Intel RealSense R200**: Please follow our detailed [Setup Guide](./docs/dependencies-realsense-r200.md "RealSense R200 setup guide")
-* **Intel RealSense D400**: You need to install the [Python wrapper for librealsense](https://github.com/IntelRealSense/librealsense/tree/master/wrappers/python#python-wrapper "Install instructions for librealsense Python wrapper")
-
-
 ### Clone the repo
 After you have installed all dependencies, clone this repo and start Pupil software.
 

deployment/bundle.bat

@@ -35,9 +35,6 @@ if not exist %release_dir% (
 set PATH=%PATH%;C:\Python36\Lib\site-packages\scipy\.libs
 set PATH=%PATH%;C:\Python36\Lib\site-packages\zmq
 
-python ..\pupil_src\shared_modules\cython_methods\build.py
-python ..\pupil_src\shared_modules\calibration_routines\optimization_calibration\build.py
-
 call :Bundle capture %current_tag%
 call :Bundle service %current_tag%
 call :Bundle player %current_tag%

deployment/bundle.sh

@@ -13,12 +13,6 @@ fi
 echo "release_dir:  ${release_dir}"
 mkdir ${release_dir}
 
-printf "\n##########\nBuilding cython modules\n##########\n\n"
-python3 ../pupil_src/shared_modules/cython_methods/build.py
-
-printf "\n##########\nBuilding calibration methods\n##########\n\n"
-python3 ../pupil_src/shared_modules/calibration_routines/optimization_calibration/build.py
-
 # bundle Pupil Capture
 printf "\n##########\nBundling Pupil Capture\n##########\n\n"
 cd deploy_capture

deployment/deploy_capture/bundle.spec

@@ -56,10 +56,6 @@ if platform.system() == "Darwin":
     sys.path.append(".")
     from version import pupil_version
 
-    import pyrealsense
-
-    pyrealsense_path = pathlib.Path(pyrealsense.__file__).parent / "lrs_parsed_classes"
-
     del sys.path[-1]
     a = Analysis(
         ["../../pupil_src/main.py"],
@@ -98,11 +94,9 @@ if platform.system() == "Darwin":
         a.datas,
         [("libuvc.0.dylib", "/usr/local/lib/libuvc.0.dylib", "BINARY")],
         [("libglfw.dylib", "/usr/local/lib/libglfw.dylib", "BINARY")],
-        [("librealsense.dylib", "/usr/local/lib/librealsense.dylib", "BINARY")],
         [("pyglui/OpenSans-Regular.ttf", ui.get_opensans_font_path(), "DATA")],
         [("pyglui/Roboto-Regular.ttf", ui.get_roboto_font_path(), "DATA")],
         [("pyglui/pupil_icons.ttf", ui.get_pupil_icons_font_path(), "DATA")],
-        [("pyrealsense/lrs_parsed_classes", pyrealsense_path, "DATA")],
         apriltag_libs,
         strip=None,
         upx=True,
@@ -127,7 +121,7 @@ elif platform.system() == "Linux":
         + apriltag_hidden_imports,
         hookspath=None,
         runtime_hooks=None,
-        excludes=["matplotlib", "pyrealsense"],
+        excludes=["matplotlib"],
     )
 
     pyz = PYZ(a.pure)

deployment/deploy_player/bundle.spec

@@ -69,7 +69,7 @@ if platform.system() == "Darwin":
         ),
         hookspath=None,
         runtime_hooks=None,
-        excludes=["matplotlib", "pyrealsense"],
+        excludes=["matplotlib"],
     )
 
     pyz = PYZ(a.pure)
@@ -126,7 +126,7 @@ elif platform.system() == "Linux":
         + apriltag_hidden_imports,
         hookspath=None,
         runtime_hooks=None,
-        excludes=["matplotlib", "pyrealsense"],
+        excludes=["matplotlib"],
     )
 
     pyz = PYZ(a.pure)
@@ -214,7 +214,7 @@ elif platform.system() == "Windows":
         + apriltag_hidden_imports,
         hookspath=None,
         runtime_hooks=None,
-        excludes=["matplotlib", "pyrealsense"],
+        excludes=["matplotlib"],
     )
 
     pyz = PYZ(a.pure)

deployment/deploy_service/bundle.spec

@@ -53,7 +53,7 @@ if platform.system() == "Darwin":
         hiddenimports=[] + av_hidden_imports + pyglui_hidden_imports,
         hookspath=None,
         runtime_hooks=None,
-        excludes=["matplotlib", "pyrealsense"],
+        excludes=["matplotlib"],
     )
     pyz = PYZ(a.pure)
     exe = EXE(
@@ -99,7 +99,7 @@ elif platform.system() == "Linux":
         hiddenimports=[] + av_hidden_imports + pyglui_hidden_imports,
         hookspath=None,
         runtime_hooks=None,
-        excludes=["matplotlib", "pyrealsense"],
+        excludes=["matplotlib"],
     )
 
     pyz = PYZ(a.pure)
@@ -181,7 +181,7 @@ elif platform.system() == "Windows":
         runtime_hooks=None,
         win_no_prefer_redirects=False,
         win_private_assemblies=False,
-        excludes=["matplotlib", "pyrealsense"],
+        excludes=["matplotlib"],
     )
 
     pyz = PYZ(a.pure)