Merge pull request #63 from ShaheedHaque/srh_issue_62

ShaheedHaque · web-flow · commit 5c64c087e047 · 2024-09-03T12:05:45.000+01:00
Fix for pip "RECORD file not found" issue
diff --git a/Makefile b/Makefile
@@ -35,14 +35,14 @@ python_code: setup.py pyproject.toml
 	# too hard to check for.
 	#
 	$(eval PIP_VERSION := $(shell $(PIP) --version 2>&1 | cut -d ' ' -f 2 | cut -d '.' -f 1))
-	$(eval PIP_FLAGS := $(shell [ $(PIP_VERSION) -ge 23 ] && echo "--break-system-packages"))
+	$(eval PIP_FLAGS := $(shell [ $(PIP_VERSION) -ge 23 ] && echo "--break-system-packages --ignore-installed"))
 	#
 	# Workaround https://github.com/pgsql-io/multicorn2/issues/34, and then
 	# re-evaluate PIP_VERSION/PIP_FLAGS.
 	#
 	$(PIP) install $(PIP_FLAGS) --upgrade 'pip>=23'
 	$(eval PIP_VERSION := $(shell $(PIP) --version 2>&1 | cut -d ' ' -f 2 | cut -d '.' -f 1))
-	$(eval PIP_FLAGS := $(shell [ $(PIP_VERSION) -ge 23 ] && echo "--break-system-packages"))
+	$(eval PIP_FLAGS := $(shell [ $(PIP_VERSION) -ge 23 ] && echo "--break-system-packages --ignore-installed"))
 	$(PIP) install $(PIP_FLAGS) .
 
 release-zip: all

Original file line number	Diff line number	Diff line change
`@@ -35,14 +35,14 @@ python_code: setup.py pyproject.toml`
`35`	`35`	`# too hard to check for.`
`36`	`36`	`#`
`37`	`37`	`$(eval PIP_VERSION := $(shell $(PIP) --version 2>&1 \| cut -d ' ' -f 2 \| cut -d '.' -f 1))`
`38`		`- $(eval PIP_FLAGS := $(shell [ $(PIP_VERSION) -ge 23 ] && echo "--break-system-packages"))`
	`38`	`+ $(eval PIP_FLAGS := $(shell [ $(PIP_VERSION) -ge 23 ] && echo "--break-system-packages --ignore-installed"))`
`39`	`39`	`#`
`40`	`40`	`# Workaround https://github.com/pgsql-io/multicorn2/issues/34, and then`
`41`	`41`	`# re-evaluate PIP_VERSION/PIP_FLAGS.`
`42`	`42`	`#`
`43`	`43`	`$(PIP) install $(PIP_FLAGS) --upgrade 'pip>=23'`
`44`	`44`	`$(eval PIP_VERSION := $(shell $(PIP) --version 2>&1 \| cut -d ' ' -f 2 \| cut -d '.' -f 1))`
`45`		`- $(eval PIP_FLAGS := $(shell [ $(PIP_VERSION) -ge 23 ] && echo "--break-system-packages"))`
	`45`	`+ $(eval PIP_FLAGS := $(shell [ $(PIP_VERSION) -ge 23 ] && echo "--break-system-packages --ignore-installed"))`
`46`	`46`	`$(PIP) install $(PIP_FLAGS) .`
`47`	`47`
`48`	`48`	`release-zip: all`