From 50a8817244769ead2b92f5e1165ce6feb922bdd7 Mon Sep 17 00:00:00 2001 From: Lydia Duncan Date: Tue, 15 Oct 2024 12:45:18 -0700 Subject: [PATCH] c2chapel dependency changes 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 ---- Signed-off-by: Lydia Duncan --- third-party/chpl-venv/c2chapel-requirements.txt | 4 ++-- tools/c2chapel/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/third-party/chpl-venv/c2chapel-requirements.txt b/third-party/chpl-venv/c2chapel-requirements.txt index 8930fa110534..525c5e8fb101 100644 --- a/third-party/chpl-venv/c2chapel-requirements.txt +++ b/third-party/chpl-venv/c2chapel-requirements.txt @@ -1,3 +1,3 @@ # tools/c2chapel/Makefile should match so fakeHeaders download matches -pycparser==2.22 -pycparserext +pycparser==2.20 +pycparserext==2021.1 diff --git a/tools/c2chapel/Makefile b/tools/c2chapel/Makefile index a72cab4fbac9..52baecbd84e4 100644 --- a/tools/c2chapel/Makefile +++ b/tools/c2chapel/Makefile @@ -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)