pipenv -> poetry (#130)

* pipenv -> poetry

* fix pre-commit

* rm that

* don't spellcheck lock file

* new poetry is broken

* add comment back
This commit is contained in:
Adeeb Shihadeh
2023-04-15 11:43:28 -07:00
committed by GitHub
parent 3468b2e71f
commit d57b0a2bdc
5 changed files with 4151 additions and 3310 deletions
+5 -5
View File
@@ -4,11 +4,11 @@ repos:
- id: check-hooks-apply
- id: check-useless-excludes
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v4.4.0
hooks:
- id: check-ast
exclude: '^(tools)/'
- id: check-json
- id: check-toml
- id: check-xml
- id: check-yaml
- id: check-merge-conflict
@@ -16,16 +16,16 @@ repos:
- id: check-added-large-files
args: ['--maxkb=100']
- repo: https://github.com/codespell-project/codespell
rev: v2.2.2
rev: v2.2.4
hooks:
- id: codespell
exclude: '^(userspace/files/serviceproviders.xml)|(tools/)'
exclude: '^(userspace/files/serviceproviders.xml)|(tools/)|(userspace/poetry.lock)'
args:
# if you've got a short variable name that's getting flagged, add it here
- -L bu,ro,te,ue,alo,hda,ois,nam,nams,ned,som,parm,setts,inout,warmup
- --builtins clear,rare,informal,usage,code,names,en-GB_to_en-US
- repo: https://github.com/PyCQA/flake8
rev: 5.0.4
rev: 6.0.0
hooks:
- id: flake8
exclude: '^(tools/)'
+7 -6
View File
@@ -79,17 +79,18 @@ RUN cd /tmp && apt-get -o Dpkg::Options::="--force-overwrite" install -yq ./ffmp
COPY --from=agnos-compiler-mapbox-gl-native /tmp/libqmapboxgl.so /lib/aarch64-linux-gnu/libqmapboxgl.so
# Install openpilot python packages
COPY ./userspace/Pipfile* /tmp/agnos/
COPY ./userspace/pyproject.toml ./userspace/poetry.lock /tmp/agnos/
RUN export PATH="/usr/local/pyenv/bin:/usr/local/pyenv/shims:$PATH" && \
export PYENV_ROOT="/usr/local/pyenv" && \
eval "$(pyenv init -)" && \
pip3 install --no-cache-dir --upgrade pip==22.1 && \
pip3 install --no-cache-dir --upgrade pipenv==2022.5.2 && \
eval "$(pyenv virtualenv-init -)" && \
pip3 install --no-cache-dir --upgrade pip==22.3.1 poetry==1.2.2 && \
cd /tmp/agnos && \
poetry config virtualenvs.prefer-active-python true --local && \
poetry config virtualenvs.create false --local && \
export PYOPENCL_CL_PRETEND_VERSION="2.0" && \
MAKEFLAGS="-j$(nproc)" pipenv sync --system --dev && \
pipenv --clear && \
pip uninstall -y pipenv && \
export POETRY_VIRTUALENVS_CREATE=false && \
MAKEFLAGS="-j$(nproc)" poetry install --no-cache --no-root && \
pyenv rehash
# Install nice to haves
-3264
View File
File diff suppressed because it is too large Load Diff
+4101
View File
File diff suppressed because it is too large Load Diff
+38 -35
View File
@@ -1,35 +1,11 @@
[[source]]
name = "pypi"
url = "https://pypi.org/simple"
verify_ssl = true
[tool.poetry]
name = "agnos"
version = "0.1.0"
authors = ["Vehicle Researcher <user@comma.ai>"]
description = ""
[dev-packages]
ipython = "*"
azure-core = "*"
azure-common = "*"
azure-storage-blob = "~=2.1"
azure-storage-common = "~=2.1"
pycurl = "*"
git-pylint-commit-hook = "*"
tenacity = "*"
mock = "*"
dictdiffer = "*"
aenum = "*"
coverage = "*"
paramiko = "*"
lru-dict = "*"
pprofile = "*"
pyprof2calltree = "*"
pre-commit = "*"
mypy = "*"
parameterized = "*"
inputs = "*"
casadi = "*"
future-fstrings = "*" # needed for acados for now
tabulate = "*"
flaky = "*"
[packages]
[tool.poetry.dependencies]
python = "^3.8"
atomicwrites = "*"
cffi = "*"
crcmod = "*"
@@ -60,10 +36,10 @@ flake8 = "*"
pylint = "*"
pillow = "*"
scons = "*"
scons-contrib = {git = "https://github.com/SCons/scons-contrib"}
sconscontrib = {git = "https://github.com/SCons/scons-contrib"}
cysignals = "*"
pycryptodome = "*"
"Jinja2" = "*"
Jinja2 = "*"
PyJWT = "*"
pyserial = "*"
dbus-python = "*"
@@ -83,6 +59,33 @@ sounddevice = "*"
zstandard = "*"
zstd = "*"
pyzstd = "*"
casadi = "*"
[requires]
python_version = "3.8"
[tool.poetry.group.dev.dependencies]
ipython = "*"
azure-core = "*"
azure-common = "*"
azure-storage-blob = "~=2.1"
azure-storage-common = "~=2.1"
pycurl = "*"
git-pylint-commit-hook = "*"
tenacity = "*"
mock = "*"
dictdiffer = "*"
aenum = "*"
coverage = "*"
paramiko = "*"
lru-dict = "*"
pprofile = "*"
pyprof2calltree = "*"
pre-commit = "*"
mypy = "*"
parameterized = "*"
inputs = "*"
future-fstrings = "*"
tabulate = "*"
flaky = "*"
[build-system]
requires = ["poetry-core"]
build-backend = "poetry.core.masonry.api"