Skip to content

Commit

Permalink
cleanup dependencies (commaai#2001)
Browse files Browse the repository at this point in the history
* cleanup dependencies

* in the real spot

* fix jenkins
  • Loading branch information
adeebshihadeh authored Aug 18, 2024
1 parent c4e75ee commit cfa8b79
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 30 deletions.
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
rm -rf arm/ && \
rm -rf thumb/nofp thumb/v6* thumb/v8* thumb/v7+fp thumb/v7-r+fp.sp

COPY requirements.txt /tmp/
RUN pip3 install --break-system-packages --no-cache-dir -r /tmp/requirements.txt

ENV CPPCHECK_DIR=/tmp/cppcheck
COPY tests/misra/install.sh /tmp/
RUN /tmp/install.sh && rm -rf $CPPCHECK_DIR/.git/
ENV SKIP_CPPCHECK_INSTALL=1

COPY setup.py __init__.py $PYTHONPATH/panda/
COPY python/__init__.py $PYTHONPATH/panda/python/
RUN pip3 install --break-system-packages --no-cache-dir $PYTHONPATH/panda/[dev]

# TODO: this should be a "pip install" or not even in this repo at all
RUN git config --global --add safe.directory $PYTHONPATH/panda
ENV OPENDBC_REF="5ed7a834a4e0e24c3968dd1e98ceb4b9d5f9791a"
RUN mkdir -p $PYTHONPATH && \
cd /tmp/ && \
RUN cd /tmp/ && \
git clone --depth 1 https://github.com/commaai/opendbc opendbc_repo && \
cd opendbc_repo && git fetch origin $OPENDBC_REF && git checkout FETCH_HEAD && rm -rf .git/ && \
pip3 install --break-system-packages --no-cache-dir Cython numpy && \
Expand All @@ -41,5 +41,5 @@ RUN mkdir -p $PYTHONPATH && \

# for Jenkins
COPY README.md panda.tar.* /tmp/
RUN mkdir /tmp/pythonpath/panda && \
RUN mkdir -p /tmp/pythonpath/panda && \
tar -xvf /tmp/panda.tar.gz -C /tmp/pythonpath/panda/ || true
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ git clone https://github.com/commaai/panda.git
cd panda

# install dependencies
pip install -r requirements.txt
pip install -e .[dev]

# install panda
python setup.py install
Expand Down
18 changes: 0 additions & 18 deletions requirements.txt

This file was deleted.

24 changes: 19 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,26 @@ def find_version(*file_paths):
platforms='any',
license='MIT',
install_requires=[
'libusb1 == 2.0.1',
'hexdump >= 3.3',
'pycryptodome >= 3.9.8',
'tqdm >= 4.14.0',
'requests'
'libusb1',
],
extras_require = {
'dev': [
"scons",
"pycryptodome >= 3.9.8",
"cffi",
"flaky",
"pytest",
"pytest-mock",
"pytest-xdist",
"pytest-timeout",
"pytest-randomly",
"parameterized",
"pre-commit",
"numpy",
"ruff",
"spidev",
],
},
ext_modules=[],
description="Code powering the comma.ai panda",
long_description='See https://github.com/commaai/panda',
Expand Down

0 comments on commit cfa8b79

Please sign in to comment.