From c03f0431b9ed8dc04068e3a06dc857cfa1ce0fc3 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 5 Sep 2023 09:45:52 -0400 Subject: [PATCH 1/3] Replace a few more uses of virtualenv with venv --- .appveyor.yml | 6 +++--- README.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 4dec8e42..ffbb33d5 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -3,7 +3,7 @@ # to create a "native" platform experience, using as few cross-platform # helper tools as possible. # -# On Linux/Mac a virtualenv is used for testing. The effective virtual env +# On Linux/Mac a venv is used for testing. The effective venv environment # is available under ~/VENV. # # All workers support remote login. Login details are shown at the top of each @@ -238,9 +238,9 @@ install: # appveyor provided environments/installation). Note, these are broken # on the ubuntu images # https://help.appveyor.com/discussions/problems/28217-appveyor-ubunu-image-with-python3-lzma-module - # Otherwise create a virtualenv using the default Python 3, to enable uniform + # Otherwise create a new venv using the default Python 3, to enable uniform # use of python/pip executables below - - sh: "[ \"x$PY\" != x ] && . ${HOME}/venv${PY}/bin/activate || virtualenv -p 3 ${HOME}/dlvenv && . ${HOME}/dlvenv/bin/activate; ln -s \"$VIRTUAL_ENV\" \"${HOME}/VENV\"" + - sh: "[ \"x$PY\" != x ] && . ${HOME}/venv${PY}/bin/activate || python -m venv -p 3 ${HOME}/dlvenv && . ${HOME}/dlvenv/bin/activate; ln -s \"$VIRTUAL_ENV\" \"${HOME}/VENV\"" - cmd: "set PATH=C:\\Python%PY%;C:\\Python%PY%\\Scripts;%PATH%" # deploy the datalad installer, override version via DATALAD_INSTALLER_VERSION - cmd: diff --git a/README.md b/README.md index c4446b41..e846aa9f 100644 --- a/README.md +++ b/README.md @@ -20,10 +20,10 @@ software packages that intend to build on this improved set of functionality. ``` # create and enter a new virtual environment (optional) -$ virtualenv --python=python3 ~/env/dl-next +$ python3 -m venv ~/env/dl-next $ . ~/env/dl-next/bin/activate # install from PyPi -$ python -m pip install datalad-next +$ python3 -m pip install datalad-next ``` ## How to use From a62371e2152bab8defd546d0b559d44e6e2a18de Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Wed, 6 Sep 2023 11:17:20 -0400 Subject: [PATCH 2/3] Use correct python executable and no explicit -p should be there --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index ffbb33d5..b43289d2 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -240,7 +240,7 @@ install: # https://help.appveyor.com/discussions/problems/28217-appveyor-ubunu-image-with-python3-lzma-module # Otherwise create a new venv using the default Python 3, to enable uniform # use of python/pip executables below - - sh: "[ \"x$PY\" != x ] && . ${HOME}/venv${PY}/bin/activate || python -m venv -p 3 ${HOME}/dlvenv && . ${HOME}/dlvenv/bin/activate; ln -s \"$VIRTUAL_ENV\" \"${HOME}/VENV\"" + - sh: "[ \"x$PY\" != x ] && . ${HOME}/venv${PY}/bin/activate || python3 -m venv ${HOME}/dlvenv && . ${HOME}/dlvenv/bin/activate; ln -s \"$VIRTUAL_ENV\" \"${HOME}/VENV\"" - cmd: "set PATH=C:\\Python%PY%;C:\\Python%PY%\\Scripts;%PATH%" # deploy the datalad installer, override version via DATALAD_INSTALLER_VERSION - cmd: From 1e1aa074483e489f5b254904d0779122849614d2 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Wed, 6 Sep 2023 13:01:17 -0400 Subject: [PATCH 3/3] Install python3-venv for Ubu20 where to be used for CI env --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index b43289d2..28e4cbb4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -65,11 +65,11 @@ environment: - ID: Ubu20 DTS: datalad_next APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 + INSTALL_SYSPKGS: python3-venv # datalad-annex git remote needs something after git-annex_8.20211x INSTALL_GITANNEX: git-annex -m snapshot CODECOV_BINARY: https://uploader.codecov.io/latest/linux/codecov DEPLOY_HTTPBIN_IMAGE: yes - INSTALL_SYSPKGS: # Windows core tests - ID: WinP39core # ~35 min