Commit Graph

31 Commits

Author SHA1 Message Date
Willem Melching
4f25dc66dc MacOS: homebrew arm-none-eabi-gcc works again (#26903)
Revert "Fix gcc-arm-embedded for m1 mac (#24515)"

This reverts commit fd1cd108bd724e49e281a487c4089f85b3dc12b1.
old-commit-hash: 19a15eeb539c8e8f53166b8885e09d6276d32fd8
2023-01-09 10:30:30 -08:00
HaraldSchafer
3ca9b7f02e 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 aacf6ae3

* 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 3e41c775cbf670740ac648a8614d2d6b433312fe

* 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>
old-commit-hash: a98d105cb95a445f5ec69e783585c56604b09449
2022-10-21 16:23:56 -07:00
Ross Fisher
bc986e10ff 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>
old-commit-hash: 01a237ef02cf989a3e2dc8a529d5a0338a09e123
2022-05-13 11:12:59 +02:00
Adeeb Shihadeh
ce42e116c9 mac setup: add catch2
old-commit-hash: c65ca6ab1d609ac291f4b57eb3414236bd648999
2022-03-05 15:29:06 -08:00
Andrew
c8ef3e4990 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>
old-commit-hash: df627de7bf10e2267f7aa66ec9830d004e699b0a
2022-02-23 13:04:50 +01:00
Andrew
192978753d 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>
old-commit-hash: 66644217100f17e0a0c4f95f86aed2fd8c09c28c
2022-01-07 15:15:18 -08:00
Adeeb Shihadeh
02f1866b61 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
old-commit-hash: 066e3e3626f56d8f86c120defe4181eaed0182f4
2022-01-02 14:47:16 -08:00
Adeeb Shihadeh
55e0fb4a55 fix setup scripts if git isn't installed
old-commit-hash: 7cd6a88638be390e0a7a13210e837afc36e1c18c
2021-12-31 19:29:38 -08:00
Adeeb Shihadeh
d710eed2d9 mac_setup: install git-lfs
old-commit-hash: 8fe9c0ef931a19be187fe8fceb3cf69e8864f80f
2021-12-31 10:08:34 -08:00
eFini
22ea8f17c2 macOS: Fix missing pip command issue. (#22924)
* Fixed missing pip command issue.

* add path to openpilot_env.sh for mac
old-commit-hash: a87190342bbe30aa4fd09c1f9586d9a7060e8b76
2021-11-17 11:23:05 +01:00
lipniak
9fcb713e9c 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>
old-commit-hash: 1d55f2f23e31dd64568d729ef33325cf229fdf51
2021-10-31 16:37:07 +01:00
Lasse Skov
aade2e1025 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>
old-commit-hash: 25def3cc34708aa42859bf6362ba35cefafd61d4
2021-10-10 16:03:56 -07:00
Ankush Girotra
5c63aa3f7c fix mac setup script for zsh (#20708)
Co-authored-by: Ankush Girotra <ankush.girotra@dlzpgroup.com>
old-commit-hash: 18a59c0d4b5660bf315e90a2574b744d17e471ee
2021-04-20 17:28:10 -07:00
Philipp Braun
ed5606ecba Add mac requirements (#20420)
* Add mac requirements

* Remove bashrc spam
old-commit-hash: 523d36e7ca4aa0a6796718fc50da340aca56c210
2021-03-30 15:45:28 -07:00
Willem Melching
285e086d80 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
old-commit-hash: 0e338d2b91f35af6a7222eeb414951cd88784092
2021-03-24 14:44:39 +01:00
Adeeb Shihadeh
1eed3b756b fix cached mac CI run (#20294)
old-commit-hash: 92c5bbf92de0401c6f6a7c8f9d246dcf75644dbb
2021-03-09 19:37:17 -08:00
Adeeb Shihadeh
8ec4fa1002 update to python 3.8.5 (#20217)
old-commit-hash: 2034a047507c9eb69dd431d6527fff0af6157c62
2021-03-09 13:38:22 -08:00
Adeeb Shihadeh
905105e94a fix mac CI (#19829)
* hopefully this isn't slow

* upgrade

* try this

* apparently this is the right way to do this
old-commit-hash: 14f9700f6af4e8139138a8272f6ccf2325f16b08
2021-01-18 17:28:30 -08:00
Willem Melching
90dda34c8b new macOS cache
old-commit-hash: 0a911a5e28834104d3322a4d79af2272ad51e5a5
2021-01-18 16:17:23 +01:00
Willem Melching
42ba637d9b Fix macOS CI (#19822)
* does this fix the hash

* this is not the solution

* restore key doesnt work
old-commit-hash: 667390701f8a74f55343d5c1d3a21ea2392affac
2021-01-18 15:08:11 +01:00
Willem Melching
2bef6edc2d fix mac build
old-commit-hash: 4fa5b2091fe932a0fefc72511499860b4a28e2ba
2021-01-18 14:35:47 +01:00
Mayfield
dc72980c83 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
old-commit-hash: cbc25cc0f1c639e948181e1218db60631cf9ff66
2021-01-03 12:33:42 -08:00
grekiki
9f0611507e 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>
old-commit-hash: 5b26c97141b65e3bcbddaec7e6526d5f2f1c910e
2020-12-18 13:29:20 +01:00
Adeeb Shihadeh
ffd5ea18bc Fix mac CI (#2439)
old-commit-hash: 30c50e64fd0330136563657245ef00937e7dd81f
2020-10-28 14:12:56 -07:00
Adeeb Shihadeh
8f9f31778d get rid of rest of czmq
old-commit-hash: f571b7c751847fbf6f28006fc4c4d57e640636d5
2020-10-27 19:07:56 -07:00
Willem Melching
ee0db09976 More macOS CI fixes (#2352)
* Revert "Fix macOS CI (#2345)"

This reverts commit aab966d935e2033254abd64a1fae97145dcc3a6a.

* ignore update output
old-commit-hash: e23bb6113b7abe9ecb092ced1f36ea3f9bfd3611
2020-10-16 20:12:44 +02:00
Willem Melching
e952dd722d Fix macOS CI (#2345)
old-commit-hash: 72a996a8857f98f3cc30c6fe4cef37596e6c6fdf
2020-10-15 14:16:41 +02:00
Greg Hogan
f1835a740a more pipenv version updates
old-commit-hash: be2b093d6ea74a9d6b6eb5a4b7858b0889bb29c9
2020-09-15 18:25:16 -07:00
Willem Melching
473fb11d34 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>
old-commit-hash: e115c514521c7705112bd0cb2e4bf865b536501a
2020-08-20 17:16:44 +02:00
Michael Honan
df26e99856 Setup script improvements to MacOS / Ubuntu (#2012)
* Setup script improvements to MacOS / Ubuntu

scons isn't actually required from brew install

pyenv init on all envs

added installation to .zshrc on macos with better dir logic

Using git to detect project root for ubuntu bashrc install

Check shell and determine correct RC file

Update tools/mac_setup.sh

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

Sourcing RC file only if it's found

Removed unnecessary source of rc file

Submodules should never have been bumped...

Output the $RC_FILE when successfully installed

pyenv init every time, and skip RC install on CI

Confused bash conditionals, opposite of what I meant

* Was missing libusb on a fresh MacOS 10.15.6 install

Co-authored-by: Michael Honan <michaelhonan@Michaels-MacBook-Pro.local>
old-commit-hash: 4a9228fcc776d898287ebc015cab0a11fd3cdc64
2020-08-14 18:03:55 -07:00
Adeeb Shihadeh
355e4a40a6 Build openpilot on mac in CI (#1792)
* build on mac in CI

* coreutils

* python stuff

* pipenv

* newer clang

* init pyenv

* verbose

* init pyenv

* install eigen

* ffmpeg

* sdl

* libav

* libtool

* glfw

* add pipfile as cache key

* test cache

* fix cache path

* brew link

* update tools readme

* don't cache on pipfile

* skip python install if installed

* unlink

* simpler cachingm

* here's your key

* cache pip too

* cache pyenv
old-commit-hash: c450110f961173302bec7873b81939f01d5ad1ac
2020-08-10 00:44:24 -07:00