Skip to content

Commit

Permalink
c2chapel dependency changes (#26095)
Browse files Browse the repository at this point in the history
[reviewed by @mppf]

Undo version upgrade for pycparser because it is not actually compatible
with the newest version of pycparserext (despite it apparently
installing cleanly if you didn't have an older version of pycparserext
installed on your machine, so far as I can tell)

Explicitly set the version of pycparserext to the latest version. This
should help avoid the testing mishap in the future, since explicitly
specifying the version makes it tell us if we upgrade to a version of
pycparser that is incompatible with it.

Update the Makefile for c2chapel to stay in line with the pycparser
version

Passed a full paratest with futures after having built c2chapel (in a
setting where I verified I was getting the failure)
  • Loading branch information
lydia-duncan authored Oct 15, 2024
2 parents d8eed2d + 50a8817 commit e7ba7c9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions third-party/chpl-venv/c2chapel-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# tools/c2chapel/Makefile should match so fakeHeaders download matches
pycparser==2.22
pycparserext
pycparser==2.20
pycparserext==2021.1
2 changes: 1 addition & 1 deletion tools/c2chapel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ link=$(bdir)/c2chapel

# Note, this version is used only for the fake headers,
# but it should probably match third-party/chpl-venv/c2chapel-requirements.txt
VERSION=2.22
VERSION=2.20
TAR=release_v$(VERSION).tar.gz

RELEASE=https://github.com/eliben/pycparser/archive/$(TAR)
Expand Down

0 comments on commit e7ba7c9

Please sign in to comment.