Skip to content

Commit

Permalink
Restore PyYAML 5.4.1 to avoid TypeError in webassets 0.12.1
Browse files Browse the repository at this point in the history
CKAN 2.9.9 requires webassets 0.12.1, which calls yaml.load() without a Loader. This generated a warning in pyyaml 5.4.1, but raises a TypeError in 6.x.
  • Loading branch information
danielbreves authored Sep 26, 2023
1 parent 766a291 commit 63d1126
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions images/ckan/2.9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 63d1126

Please sign in to comment.