Commit Graph

52 Commits

Author SHA1 Message Date
Adeeb Shihadeh
c8622c9553 mac's getting there 2024-07-25 14:27:29 -07:00
Hoang Bui
15d3397ec6 CI: Compile openpilot on macOS (#32909)
* working

* cache

* bring back
2024-07-08 23:42:26 +00:00
Adeeb Shihadeh
5341512fce macOS: remove pyenv 2024-06-19 19:49:49 -07:00
commaci-public
71063d66cd [bot] Update Python packages and pre-commit hooks (#32682)
* Update Python packages and pre-commit hooks

* fix linter

* poetry lock

---------

Co-authored-by: Vehicle Researcher <user@comma.ai>
Co-authored-by: Maxime Desroches <desroches.maxime@gmail.com>
2024-06-10 17:19:01 -07:00
Adeeb Shihadeh
1eb938b8e8 Revert no pyenv (#32547)
* Revert "`ubuntu_setup`: fix `No module apt_pkg` error when setting up (#32526)"

This reverts commit f4322666c6.

* Revert "Removal of pyenv (#32512)"

This reverts commit f5752121f8.
2024-05-26 21:21:50 -07:00
Mauricio Alvarez Leon
f5752121f8 Removal of pyenv (#32512)
* initial removal of pyenv

* remove .python-version copy in dockerfile

* successful image build with ppa

* update prompt

* pip install scons

* apt install scons

* finally fix dockerfile to work with venv

* cleanup userflow

* increase memory to 100m

* typos

* wrong variable

* lmao
2024-05-23 07:56:18 -07:00
Adeeb Shihadeh
3e023146d2 remove gcc from mac_setup.sh 2024-05-17 21:06:18 -07:00
Kacper Rączy
f0b8ecd14f macOS: add prompt about support in setup script (#29939)
* Add prompt about the state of macos support in mac_setup

* Change words

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>

---------

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
2023-09-15 19:05:32 -07:00
Kacper Rączy
57f0c3b8d5 macos: link qt5 during setup (#29879)
* link qt5 or prompt user to unlink existing qt installation if needed

* change condition

* version detection fixes

* fix wording
2023-09-11 17:00:08 -07:00
royjr
ece433f18e macOS: install gcc@13 to match panda requirements (#29868) 2023-09-10 16:26:27 -07:00
Kacper Rączy
39d2517d3d macOS: generate .pyenvrc during setup (#29698)
* Create .pyenvrc if it does not exist

* Replace source zshrc with pyenvrc

* Remove unnecessary variables if pyenv wasn't installed

* Add check fo PYENV_SHELL

* source instead of eval

* printf instead of echo

* leave previous pyenvrc path to source

* Add newline

* Change shebang

* Dont source the file after setup

* eval virtualenv-init too

* modify comment

* Just unset broken function on macos
2023-08-29 16:01:04 -07:00
Kacper Rączy
0f7be5b1e6 Setup cleanup vol. 2 (#29456)
* code from setup cleanup #29419

update ci

update ci

export variables for mac os

check env

what is in the profile script?

install pyenv the same everywhere

temporarily disable brew cache

temporarily disable brew cache

try fixing pyenv virtualenv-init

try this

inject shims path earlier

try alternate install method

switch back to brew install

try         eval "$(pyenv init --path)"

add eval "\$(pyenv init --path)"

* Add local .env file to the cache list

* Change .env paths

* debug line

* order?

* remove .env

* Add .venv to caches

---------

Co-authored-by: Greg Hogan <gregjhogan@gmail.com>
2023-08-21 13:30:48 -07:00
Justin Newberry
1944945d9d Revert "setup cleanup (#29419)" (#29451)
This reverts commit ad32816fd6.
2023-08-17 13:23:06 -07:00
Greg Hogan
ad32816fd6 setup cleanup (#29419)
* setup cleanup

* update ci

* update ci

* export variables for mac os

* check env

* what is in the profile script?

* install pyenv the same everywhere

* temporarily disable brew cache

* temporarily disable brew cache

* try fixing pyenv virtualenv-init

* try this

* inject shims path earlier

* try alternate install method

* switch back to brew install

* try         eval "$(pyenv init --path)"

* add eval "\$(pyenv init --path)"
2023-08-17 08:51:16 -07:00
Adeeb Shihadeh
0ced56b2ea remove xx dependencies (#29263)
* rm xx deps

* mv that

* fix

* fix a path

* relock

* relock

* update

* update sentry

* update

* revert sentry

* Update lock

* Dummy pip package

* Not needed with poetry

* dont need dummy

---------

Co-authored-by: Bruce Wayne <harald.the.engineer@gmail.com>
2023-08-11 20:05:44 -07:00
Adeeb Shihadeh
ee7a763ba3 macOS: remove old dependencies (#29275) 2023-08-07 21:13:09 -07:00
Adeeb Shihadeh
2e634bc199 macOS: use bash_profile instead of bashrc (#29165)
Co-authored-by: Adeeb Shihadeh <adeebshihadeh@Adeebs-MacBook-Air.local>
2023-07-27 00:31:42 -07:00
Vivek Aithal
156c7a84e8 [commabody] Add body packages to op (#29162)
* add body packages

* update poetry lock
2023-07-26 23:08:23 -07:00
Kacper Rączy
45a6834a74 macOS: fix build issues & re-enable CI (#28258)
* Uncomment build_mac job

* Add PYCURL_CURL_CONFIG

* Acados universal binary

* Remove x86 macos references from sconscript

* Add missing include in cabana

* Update cereal

* Update workflow

* Remove unnecessary libpaths for darwin

* Add missing path to cached dirs

* Fix path in cache preparation step

* Add poetry caches to CI cache

* Compile acados with lower deployment target for CI

* Update cereal

* Pass -rpath in linker flags as scons doed not support RPATH on macos

* Use scons api instead of os

* @rpath in install name of acados dylibs

* SConstruct cleanup

* fix liblocationd tests by adding lib suffix based on platform

* Update cereal

* Update opendbc

* Update opendbc

* Add acados gitignore to release files

* Update cereal

* Update cereal

* Add scons_cache to build cache

* Add Caskroom to cache

* Fix typo

* Link all packages at once, instead of one by one

* Run cleanup stage using poetry

* Remove casks from cache

* Move scons cache to separate cache step

* Save scons cache only on master

* Remove restore-keys from save-scons-cache step

* Uncomment if conditions for scons save

* Add gcc-arm-embedded cask cache to cache

* Custom handling of gcc-arm-embedded toolchain cache

* Rename dep cache key

* Exclude .fseventsd from cache

* Fix glob pattern

* Remove .feventsd before caching

* Run mac_setup only if dependency cache-hit != true

* Update cereal to master

* Add overwrite flag to brew link

* Remove manual casadi build from mac_setup

* Remove restore-keys from dependency cache

* Remove linux requirement for casadi

* Restore restore-keys to dependency cache
2023-06-21 13:14:20 -07:00
Kacper Rączy
1a5f29ecc6 macOS: disable camerad and sensord build (#28164)
* Disable camerad and sensord on Darwin

* Add gcc@12 to mac_setup as it's required by panda

* Update panda
2023-05-12 13:01:00 -07:00
Willem Melching
d0b309ab0d MacOS: link against openssl@3.0 (#27978) 2023-04-19 13:31:19 -07:00
Willem Melching
19a15eeb53 MacOS: homebrew arm-none-eabi-gcc works again (#26903)
Revert "Fix gcc-arm-embedded for m1 mac (#24515)"

This reverts commit 01a237ef02.
2023-01-09 10:30:30 -08:00
HaraldSchafer
a98d105cb9 Pipenv -> poetry (#24858)
* Try poetry

* Remove casadi for now

* Update docker

* Copy pipfiles

* add casadi back

* Too many slashes

* New poetry api

* Install system

* Try again

* No more pipenv

* new dependencies

* updates

* poetry 1.2.1, install dev dependencies

* keep install pipenv for xx for now?

* add pre-commit checks for poetry

* poetry lock is too slow

* update pip

* migrate to poetry groups

* update lockfile

* don't need to specify dev group unless it is made optional

* always install poetry

* set POETRY_VIRTUALENVS_CREATE instead, and use pipenv for xx

* use env for docs docker image

* alphabetical

* poetry 1.2.2

* add dev dependencies for typing

added in 4e310b80

* remove constraint

* fix PIPENV_SYSTEM

* remove constraint

* don't need this here

* bump

* bump pipenv

adds support for installing local pyprojects (can add openpilot as dependency of xx)

* README improvements

* probably not necessary

* bump pip

* maybe not necessary?

* revert

* don't install openpilot itself into the virtual env

* remove PySide2 and shiboken2

reverts c6b749fb96

* remove Pipenv, add xx dependencies, sync system python

* add pipenv as xx dep

* semver package constraints, use old lockfile versions

* fix casadi

* remove whitespace

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>

* disable poetry cache

* cleanup

* prefer config file

Co-authored-by: Cameron Clough <cameronjclough@gmail.com>
Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
2022-10-21 16:23:56 -07:00
Ross Fisher
01a237ef02 Fix gcc-arm-embedded for m1 mac (#24515)
* Fix gcc-arm-embedded for m1 mac

* put in /tmp

* update comment

Co-authored-by: Willem Melching <willem.melching@gmail.com>
2022-05-13 11:12:59 +02:00
Adeeb Shihadeh
c65ca6ab1d mac setup: add catch2 2022-03-05 15:29:06 -08:00
Andrew
df627de7bf fix mac_setup w/ tools+plotjuggler (#23552)
* fix pycurl issue:
* use newer curl backend for pip install
* update lib paths based on brew prefix
* fix cert issue when using pycurl using certifi
* make output setup nicer

* fix linter

* typo

* dont need that actually

* revert

* pipenv in brew

* forgot this

* make brew available on fresh install

* undo

* more undo

* oops

* use sytem curl, but homebrew openssl

Co-authored-by: Willem Melching <willem.melching@gmail.com>
2022-02-23 13:04:50 +01:00
Andrew
6664421710 mac: fix setup and re-enable CI (#23365)
* rework mac_setup.sh
* ignore casadi and onnx runtime in pipfile for Darwin
* remove rust stuff
* build and install casadi

* add wget

* explicit python3. dont do onnx just yet

* resource compiler

* replace acados Darwin lib w universal2 libs

* relock Pipfile using linux machine

* Update update_requirements.sh

brackets

* Update update_requirements.sh

oops

* ci: re-enable mac build

* attempt to fix ci build:
* pip stuff?
* move rcc bin path to env script

* oops

* only mac

* k im lazy. does ci like this??

* huh??

* * use curl
* avoid casadi rebuilds
* add comment to remove protobuf
* host detect typo

* python version

* how did the builds not use swig?
* better reinstall check

* sometimes mac clang complain abt error limit

* ci: build OP in venv

* ci: bump to Big Sur
* retry? idk why it failed @ acados link

* * use macos-latest
* move rcc path to scons
* add extra paths for odd homebrew installs
* acados source change

* update macOS README

* uh, maybe?

* k nvm

* ci: ok this is strange. might be scons bug?

* fix conflicts: bump

* just add cppcheck for pre-commit stuff

* agane

* cleanup

* try that

* fix path

* no pyenv update on mac

* source

* fix rpath prefix?

* no examples

* fix exit

* let's get this cached

* add virtualenvs to cache

* why did we cache that

* let's see what's big

* more

* always ruyn

* cache scons cache

* better cache key

* fix for partial hit

* why so long

Co-authored-by: Andrew Tec <andrest@trabus.com>
Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Co-authored-by: Bruce Wayne <batman@openpilot-mac-mini.local>
2022-01-07 15:15:18 -08:00
Adeeb Shihadeh
066e3e3626 CI: use ubuntu_setup.sh (#23349)
* CI: use ubuntu_setup.sh

* works?

* need to fix paths

* set paths

* no batman for now

* pyenv version

* rehash after install packages

* unify python install

* revert that

* fix pyenv path

* no pipenv

* flip that

* fix rehash

* skip that

* revert panda
2022-01-02 14:47:16 -08:00
Adeeb Shihadeh
7cd6a88638 fix setup scripts if git isn't installed 2021-12-31 19:29:38 -08:00
Adeeb Shihadeh
8fe9c0ef93 mac_setup: install git-lfs 2021-12-31 10:08:34 -08:00
eFini
a87190342b macOS: Fix missing pip command issue. (#22924)
* Fixed missing pip command issue.

* add path to openpilot_env.sh for mac
2021-11-17 11:23:05 +01:00
lipniak
1d55f2f23e tools/setup: do not change global state (#22735)
* tools/setup: do not change global state

1. download packages in the venv
2. never change global python version

* update_requirements.sh: install to system if used by comma employees

* bump pip & pipenv versions

* no --upgrade

* run pre-commmit install in venv

* for consistency

Co-authored-by: predicate@bonzo <noreply@example.com>
Co-authored-by: Willem Melching <willem.melching@gmail.com>
2021-10-31 16:37:07 +01:00
Lasse Skov
25def3cc34 tools: use .python-version in setup scripts (#22511)
* Updated tools installer to us.python-e version file

* Updated tools installer to use .python-version file

* fix path

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
2021-10-10 16:03:56 -07:00
Ankush Girotra
18a59c0d4b fix mac setup script for zsh (#20708)
Co-authored-by: Ankush Girotra <ankush.girotra@dlzpgroup.com>
2021-04-20 17:28:10 -07:00
Philipp Braun
523d36e7ca Add mac requirements (#20420)
* Add mac requirements

* Remove bashrc spam
2021-03-30 15:45:28 -07:00
Willem Melching
0e338d2b91 use scons to build panda fw (#20457)
* use scons to build panda fw

* add arm gcc to dockerfile

* install gcc on macOS

* pandad shutdown test is flaky and broken due to faster startup

* bump panda
2021-03-24 14:44:39 +01:00
Adeeb Shihadeh
92c5bbf92d fix cached mac CI run (#20294) 2021-03-09 19:37:17 -08:00
Adeeb Shihadeh
2034a04750 update to python 3.8.5 (#20217) 2021-03-09 13:38:22 -08:00
Adeeb Shihadeh
14f9700f6a fix mac CI (#19829)
* hopefully this isn't slow

* upgrade

* try this

* apparently this is the right way to do this
2021-01-18 17:28:30 -08:00
Willem Melching
0a911a5e28 new macOS cache 2021-01-18 16:17:23 +01:00
Willem Melching
667390701f Fix macOS CI (#19822)
* does this fix the hash

* this is not the solution

* restore key doesnt work
2021-01-18 15:08:11 +01:00
Willem Melching
4fa5b2091f fix mac build 2021-01-18 14:35:47 +01:00
Mayfield
cbc25cc0f1 Make macos ci homebrew dep-caching fast (#19632)
* try out /usr/local for homebrew caching

* TEMP: disable non-macos jobs

* TEMP: disable more

* sizes

* temp: nothing change

* more

* try -1

* quotes

* delete existing downloads

* fix ~ expansion

* nothing

* try caching cellar

* move to yaml

* nothing

* nothing

* asdf

* nothing

* fixed cache key

* nothing

* stay in home dir

* keep zstd

* brew link

* fix cleaning?

* brew link in yaml

* fix zstd exclusion

* capnp

* revert mac_setup

* finish up

* done
2021-01-03 12:33:42 -08:00
grekiki
5b26c97141 Qt Offroad stats (#19498)
* probably broke a lot, need the commit though

* finally works

* make it work...

* ...

* kind of works

* better styling

* all should work

* tiny cleanup

* temp

* looks nicer

* create JWT in C++

* kilometers -> km

* use correct free methods

* dont put code in assert statement

* Build JWT payload dynamically

* get dongle id once

* include cleanup

* Remove qDebug

* Update drive_stats.cc

Github is a nice editor :)

* swap week and all and fix sconscript

* install openssl

* openssl include dirs on mac

* is this where openssl is?

* It's here

* small cleanup

Co-authored-by: Comma Device <device@comma.ai>
Co-authored-by: Willem Melching <willem.melching@gmail.com>
2020-12-18 13:29:20 +01:00
Adeeb Shihadeh
30c50e64fd Fix mac CI (#2439) 2020-10-28 14:12:56 -07:00
Adeeb Shihadeh
f571b7c751 get rid of rest of czmq 2020-10-27 19:07:56 -07:00
Willem Melching
e23bb6113b More macOS CI fixes (#2352)
* Revert "Fix macOS CI (#2345)"

This reverts commit 72a996a885.

* ignore update output
2020-10-16 20:12:44 +02:00
Willem Melching
72a996a885 Fix macOS CI (#2345) 2020-10-15 14:16:41 +02:00
Greg Hogan
be2b093d6e more pipenv version updates 2020-09-15 18:25:16 -07:00
Willem Melching
e115c51452 Qt ui for PC (#2023)
* qt ui boilerplate

* this kinda works

* cleanup

* render inside other widget

* cleanup

* more cleanup

* Not needed

* Handle click

* Draw at 20Hz

* create paint.hpp

* move stuff around

* update sidebar

* Draw vision

* this works again

* add clickable settings button

* Only collapse sidebar when started

* always use qt on linux

* fix width

* scrollable area

* talk to NetworkManager

* code to add a connection

* params toggles

* small cleanup

* add qt5 to dockerfile

* Qt on mac

* Add qt to release files

* fix macos build

* nore more ifdefs needed

* add icons

* make a bit nicer

* Hide scrollbar

Co-authored-by: Comma Device <device@comma.ai>
2020-08-20 17:16:44 +02:00