Install forked crossenv on all images (#59)

- Running into problems with renaming wheels with auditwheel

Author: virtuald

cross-ubuntu-py/Dockerfile.py311

@@ -92,7 +92,7 @@ ARG EXTRA_CROSSENV_ARGS=
 
 RUN set -xe; \
     ldconfig; \
-    python3.11 -m pip install crossenv==1.5.0; \
+    python3.11 -m pip install https://github.com/virtuald/crossenv/archive/2d59977e9e4efa7e4cb22ca7ba81f8a12c36574b.zip; \
     python3.11 -m crossenv /build/crosspy/bin/python3.11 /build/venv --sysroot=$(${TARGET_HOST}-print-sysroot) --env UNIXCONFDIR=/build/venv/cross/etc ${EXTRA_CROSSENV_ARGS}; \
     /build/venv/bin/cross-pip install wheel;
 

cross-ubuntu-py/Dockerfile.py312

@@ -98,7 +98,7 @@ ARG EXTRA_CROSSENV_ARGS=
 
 RUN set -xe; \
     ldconfig; \
-    python3.12 -m pip install 'crossenv~=1.5.0'; \
+    python3.12 -m pip install https://github.com/virtuald/crossenv/archive/2d59977e9e4efa7e4cb22ca7ba81f8a12c36574b.zip; \
     python3.12 -m crossenv /build/crosspy/bin/python3.12 /build/venv ${MACHINE_ARG} --sysroot=$(${TARGET_HOST}-gcc -print-sysroot) --env UNIXCONFDIR=/build/venv/cross/etc ${EXTRA_CROSSENV_ARGS}; \
     /build/venv/bin/cross-pip install wheel;
 

cross-ubuntu-py/Dockerfile.py313

@@ -100,7 +100,7 @@ ARG EXTRA_CROSSENV_ARGS=
 
 RUN set -xe; \
     ldconfig; \
-    python3.13 -m pip install https://github.com/virtuald/crossenv/archive/patch-pip-packaging-tags.zip; \
+    python3.13 -m pip install https://github.com/virtuald/crossenv/archive/2d59977e9e4efa7e4cb22ca7ba81f8a12c36574b.zip; \
     python3.13 -m crossenv /build/crosspy/bin/python3.13 /build/venv ${MACHINE_ARG} --sysroot=$(${TARGET_HOST}-gcc -print-sysroot) --env UNIXCONFDIR=/build/venv/cross/etc ${EXTRA_CROSSENV_ARGS}; \
     /build/venv/bin/cross-pip install wheel;
 

cross-ubuntu-py/py.mk

@@ -27,6 +27,15 @@ build/cross-python: build/cross-raspbian-py311 build/cross-raspbian-py312 build/
 push/cross-python: push/cross-raspbian-py311 push/cross-raspbian-py312 push/cross-roborio-py313 push/cross-systemcore-py313 push/cross-raspbian-py313
 
 
+# raspbian manylinux tags for crossenv
+RPI_ML_VERSIONS := $(shell seq 36 -1 17)
+RPI_MANYLINUX_TAGS := $(foreach v,$(SC_ML_VERSIONS),--platform-tag=manylinux_2_$(v)_armv7l)
+
+# systemcore manylinux tags for crossenv
+SC_ML_VERSIONS := $(shell seq 35 -1 17)
+SC_MANYLINUX_TAGS := $(foreach v,$(SC_ML_VERSIONS),--platform-tag=manylinux_2_$(v)_aarch64)
+
+
 #
 # Python 3.11
 #
@@ -40,6 +49,7 @@ build/cross-raspbian-py311:
 		--build-arg TARGET_HOST=$(TARGET_HOST_RASPBIAN) \
 		--build-arg AC_TARGET_HOST=$(AC_TARGET_HOST_RASPBIAN) \
 		--build-arg VERSION=$(VERSION_RASPBIAN) \
+		--build-arg EXTRA_CROSSENV_ARGS="$(RPI_MANYLINUX_TAGS) --platform-tag=linux_armv7l" \
 		-f Dockerfile.py311
 
 	cd cross-ubuntu-py && \
@@ -68,6 +78,7 @@ build/cross-raspbian-py312:
 		--build-arg TARGET_HOST=$(TARGET_HOST_RASPBIAN) \
 		--build-arg AC_TARGET_HOST=$(AC_TARGET_HOST_RASPBIAN) \
 		--build-arg VERSION=$(VERSION_RASPBIAN) \
+		--build-arg EXTRA_CROSSENV_ARGS="$(RPI_MANYLINUX_TAGS) --platform-tag=linux_armv7l" \
 		-f Dockerfile.py312
 
 	cd cross-ubuntu-py && \
@@ -97,6 +108,7 @@ build/cross-raspbian-py313:
 		--build-arg AC_TARGET_HOST=$(AC_TARGET_HOST_RASPBIAN) \
 		--build-arg VERSION=$(VERSION_RASPBIAN) \
 		--build-arg EXTRA_CROSS_CONFIGURE_ARGS="ac_cv_libatomic_needed=yes" \
+		--build-arg EXTRA_CROSSENV_ARGS="$(RPI_MANYLINUX_TAGS) --platform-tag=linux_armv7l" \
 		-f Dockerfile.py313
 
 	cd cross-ubuntu-py && \
@@ -130,10 +142,6 @@ push/cross-roborio-py313:
 	docker push wpilib/$(TYPE_ROBORIO)-cross-ubuntu:$(YEAR)-$(UBUNTU)-py313
 
 
-# Adding the tags, but pip ignores them because of https://github.com/benfogle/crossenv/issues/126
-SC_ML_VERSIONS := $(shell seq 35 -1 17)
-SC_MANYLINUX_TAGS := $(foreach v,$(SC_ML_VERSIONS),--platform-tag=manylinux_2_$(v)_aarch64)
-
 
 .PHONY: build/cross-systemcore-py313
 build/cross-systemcore-py313: