Merge pull request keitaroinc#113 from danielbreves/patch-1

Restore PyYAML 5.4.1 to avoid TypeError in webassets 0.12.1
eHealthAfrica · Oct 4, 2023 · a3a699c · a3a699c
2 parents 766a291 + 63d1126
commit a3a699c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/images/ckan/2.9/Dockerfile b/images/ckan/2.9/Dockerfile
@@ -60,10 +60,11 @@ COPY ./scripts/apply_ckan_patches.sh ${SRC_DIR}/apply_ckan_patches.sh
 RUN cd ${SRC_DIR} && ls -lah ${SRC_DIR} && ash ${SRC_DIR}/apply_ckan_patches.sh
 RUN rm -rf /srv/app/src/ckan/.git
 
-#### PATCH SINCE CYTON UPDATED TO 3.0.0 ###
-RUN sed -i 's/pyyaml==5.4.1/pyyaml>=6.0.1/g' ckan/requirements.txt
+# Create a constraint file that limits the Cython version to a compatible one, see https://github.com/yaml/pyyaml/issues/736
+RUN echo 'Cython < 3.0' > /tmp/constraint.txt
+RUN PIP_CONSTRAINT=/tmp/constraint.txt pip wheel --wheel-dir=/wheels PyYAML==5.4.1
 
-# RUN pip-compile ckan/requirements.in 
+# RUN pip-compile ckan/requirements.in
 RUN pip wheel --wheel-dir=/wheels -r ckan/requirements.txt
 RUN pip wheel --wheel-dir=/wheels uWSGI==2.0.20 gevent==21.12.0 greenlet==1.1.3