From 5948db2555a5d4a80b94ad046cdc028315ce2219 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Wed, 21 Feb 2024 01:04:54 +0000 Subject: [PATCH] trying python v 3.12 --- requirements-p12d5.txt | 4 ++-- venv-trog-d5.sh | 16 +++++++--------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/requirements-p12d5.txt b/requirements-p12d5.txt index e7d0bf1..00a085a 100755 --- a/requirements-p12d5.txt +++ b/requirements-p12d5.txt @@ -16,5 +16,5 @@ platformdirs==4.0 pytz==2023.3 ruff==0.1 soupsieve==2.5 -sqlparse==0.4 -piexif==1.1 +sqlparse +piexif diff --git a/venv-trog-d5.sh b/venv-trog-d5.sh index 667a4b8..68d9424 100755 --- a/venv-trog-d5.sh +++ b/venv-trog-d5.sh @@ -78,10 +78,8 @@ echo "### installing later version of pip inside $VENAME" $PYTHON -m pip install --upgrade pip $PYTHON -m pip install --upgrade setuptools -PIP=pip - -$PIP list > original-pip.list -$PIP freeze >original.txt +$PYTHON -m pip list > original-pip.list +$PYTHON -m pip freeze >original.txt # we are in /home/$USER/$VENAME/ ln -s ${TROGDIR} troggle @@ -115,17 +113,17 @@ cat ${TROGDIR}/${REQUIRE} cp -f ${TROGDIR}/${REQUIRE} ${TROGDIR}/${REQUIRE}.orig read -p "Press any key to resume ..." -$PIP install -r ${TROGDIR}/${REQUIRE} +$PYTHON -m pip install -r ${TROGDIR}/${REQUIRE} echo "### install from ${TROGDIR}/${REQUIRE} completed." echo '### ' # this installs pre-release django 5.0 if [[ "${VENAME:(-1)}" == 5 ]]; then echo "### Installing pre-release version of Django" - $PIP install --pre django + $PYTHON -m pip install --pre django fi -$PIP freeze > $REQUIRE.freeze +$PYTHON -m pip freeze > $REQUIRE.freeze # so that we can track requirements more easily with git # because we do not install these with pip, but they are listed by the freeze command # Now find out what we actually installed by subtracting the stuff venv installed anyway @@ -138,8 +136,8 @@ rm 2 # cp $REQUIRE requirements-$VENAME.txt cp $REQUIRE troggle/$REQUIRE -$PIP list > installed-pip.list -$PIP list -o > installed-pip-o.list +$PYTHON -m pip list > installed-pip.list +$PYTHON -m pip list -o > installed-pip-o.list REQ=installation-record mkdir $REQ