mirror of https://github.com/rusefi/opendbc.git
bump to python 3.11.4 (#865)
* bump to python 3.11.4 * Update requirements.txt * fix * req * fixfix --------- Co-authored-by: Maxime Desroches <desroches.maxime@gmail.com>
This commit is contained in:
parent
915a97f722
commit
f22aff9f6e
|
@ -3,7 +3,7 @@ name: tests
|
||||||
on: [push, pull_request]
|
on: [push, pull_request]
|
||||||
|
|
||||||
env:
|
env:
|
||||||
RUN: docker run -v $GITHUB_WORKSPACE:/project/opendbc -w /project/opendbc -e PYTHONWARNINGS=error --shm-size 1G --rm opendbc /bin/bash -c
|
RUN: docker run -v $GITHUB_WORKSPACE:/project/opendbc -w /project/opendbc -e PYTHONWARNINGS="error,default::DeprecationWarning" --shm-size 1G --rm opendbc /bin/bash -c
|
||||||
BUILD: |
|
BUILD: |
|
||||||
docker pull $(grep -ioP '(?<=^from)\s+\S+' Dockerfile) || true
|
docker pull $(grep -ioP '(?<=^from)\s+\S+' Dockerfile) || true
|
||||||
docker pull ghcr.io/commaai/opendbc:latest || true
|
docker pull ghcr.io/commaai/opendbc:latest || true
|
||||||
|
|
|
@ -34,13 +34,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
|
|
||||||
RUN curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
|
RUN curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
|
||||||
ENV PATH="/root/.pyenv/bin:/root/.pyenv/shims:${PATH}"
|
ENV PATH="/root/.pyenv/bin:/root/.pyenv/shims:${PATH}"
|
||||||
RUN pyenv install 3.8.10
|
RUN pyenv install 3.11.4
|
||||||
RUN pyenv global 3.8.10
|
RUN pyenv global 3.11.4
|
||||||
RUN pyenv rehash
|
RUN pyenv rehash
|
||||||
|
|
||||||
COPY requirements.txt /tmp/
|
COPY requirements.txt /tmp/
|
||||||
RUN pip install --no-cache-dir -r /tmp/requirements.txt
|
RUN pip install --no-cache-dir -r /tmp/requirements.txt
|
||||||
RUN pip install --no-cache-dir pre-commit==2.15.0 pylint==2.5.2
|
RUN pip install --no-cache-dir pre-commit==2.15.0 pylint==2.17.4
|
||||||
|
|
||||||
ENV PYTHONPATH=/project
|
ENV PYTHONPATH=/project
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ if __name__ == "__main__":
|
||||||
chrysler_path = os.path.dirname(os.path.realpath(__file__))
|
chrysler_path = os.path.dirname(os.path.realpath(__file__))
|
||||||
|
|
||||||
for out, addr_lookup in chrysler_to_ram.items():
|
for out, addr_lookup in chrysler_to_ram.items():
|
||||||
with open(os.path.join(chrysler_path, src)) as in_f, open(os.path.join(chrysler_path, out), 'w') as out_f:
|
with open(os.path.join(chrysler_path, src), encoding='utf-8') as in_f, open(os.path.join(chrysler_path, out), 'w', encoding='utf-8') as out_f:
|
||||||
out_f.write(f'CM_ "Generated from {src}"\n\n')
|
out_f.write(f'CM_ "Generated from {src}"\n\n')
|
||||||
|
|
||||||
wrote_addrs = set()
|
wrote_addrs = set()
|
||||||
|
|
|
@ -11,7 +11,7 @@ generated_suffix = '_generated.dbc'
|
||||||
|
|
||||||
|
|
||||||
def read_dbc(src_dir: str, filename: str) -> str:
|
def read_dbc(src_dir: str, filename: str) -> str:
|
||||||
with open(os.path.join(src_dir, filename)) as file_in:
|
with open(os.path.join(src_dir, filename), encoding='utf-8') as file_in:
|
||||||
return file_in.read()
|
return file_in.read()
|
||||||
|
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@ def create_dbc(src_dir: str, filename: str, output_path: str):
|
||||||
output_filename = filename.replace('.dbc', generated_suffix)
|
output_filename = filename.replace('.dbc', generated_suffix)
|
||||||
output_file_location = os.path.join(output_path, output_filename)
|
output_file_location = os.path.join(output_path, output_filename)
|
||||||
|
|
||||||
with open(output_file_location, 'w') as dbc_file_out:
|
with open(output_file_location, 'w', encoding='utf-8') as dbc_file_out:
|
||||||
dbc_file_out.write('CM_ "AUTOGENERATED FILE, DO NOT EDIT";\n')
|
dbc_file_out.write('CM_ "AUTOGENERATED FILE, DO NOT EDIT";\n')
|
||||||
|
|
||||||
for include_filename in includes:
|
for include_filename in includes:
|
||||||
|
|
|
@ -5,7 +5,7 @@ import os
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
dbc_name = os.path.basename(__file__).replace(".py", ".dbc")
|
dbc_name = os.path.basename(__file__).replace(".py", ".dbc")
|
||||||
hyundai_path = os.path.dirname(os.path.realpath(__file__))
|
hyundai_path = os.path.dirname(os.path.realpath(__file__))
|
||||||
with open(os.path.join(hyundai_path, dbc_name), "w") as f:
|
with open(os.path.join(hyundai_path, dbc_name), "w", encoding='utf-8') as f:
|
||||||
f.write("""
|
f.write("""
|
||||||
VERSION ""
|
VERSION ""
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ import os
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
dbc_name = os.path.basename(__file__).replace(".py", ".dbc")
|
dbc_name = os.path.basename(__file__).replace(".py", ".dbc")
|
||||||
hyundai_path = os.path.dirname(os.path.realpath(__file__))
|
hyundai_path = os.path.dirname(os.path.realpath(__file__))
|
||||||
with open(os.path.join(hyundai_path, dbc_name), "w") as f:
|
with open(os.path.join(hyundai_path, dbc_name), "w", encoding='utf-8') as f:
|
||||||
f.write("""
|
f.write("""
|
||||||
VERSION ""
|
VERSION ""
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
Cython==0.29.34
|
Cython
|
||||||
flake8==6.0.0
|
flake8
|
||||||
Jinja2==3.1.2
|
Jinja2
|
||||||
numpy==1.24.2
|
numpy
|
||||||
pycapnp==1.3.0
|
pycapnp
|
||||||
pylint==2.17.2
|
pylint==2.17.4
|
||||||
pyyaml==6.0
|
pyyaml
|
||||||
scons
|
scons
|
||||||
|
|
Loading…
Reference in New Issue