Merge commit '4231b0f' into subaru-community

martinl · Aug 4, 2023 · 18e09ba · 18e09ba
2 parents 8280f4b + 4231b0f
commit 18e09ba
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -49,7 +49,7 @@ RUN git config --global --add safe.directory '*'
 WORKDIR /project
 RUN git clone https://github.com/commaai/cereal.git /project/cereal && \
     cd /project/cereal && \
-    git checkout 959ff79963b80829be9902d146c31fda44dbbd20 && \
+    git checkout aed9fd278a704816aba11f4473aafefc281ed2bc && \
     rm -rf .git && \
     scons -j$(nproc)
 

diff --git a/SConstruct b/SConstruct
@@ -61,6 +61,7 @@ Export('cereal', 'messaging')
 envCython = env.Clone()
 envCython["CPPPATH"] += [np.get_include()]
 envCython["CCFLAGS"] += ["-Wno-#warnings", "-Wno-shadow", "-Wno-deprecated-declarations"]
+envCython["CCFLAGS"].remove("-Werror")
 
 python_libs = []
 if arch == "Darwin":

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-Cython<3.0.0
+Cython
 flake8
 Jinja2
 numpy