From b2a895cb89d8a920d42783851712f43c8e153c2e Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sun, 18 Jun 2023 23:07:04 +0200 Subject: [PATCH 1/2] Replace command "python" by "python3" --- docs/contributing.rst | 2 +- docs/installation.rst | 4 ++-- runtests.sh | 2 +- vcr/migration.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/contributing.rst b/docs/contributing.rst index d41a23b..a22236e 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -74,7 +74,7 @@ The PR reviewer is a second set of eyes to see if: **Release Manager:** - Ensure CI is passing. - Create a release on github and tag it with the changelog release notes. - - ``python setup.py build sdist bdist_wheel`` + - ``python3 setup.py build sdist bdist_wheel`` - ``twine upload dist/*`` - Go to ReadTheDocs build page and trigger a build https://readthedocs.org/projects/vcrpy/builds/ diff --git a/docs/installation.rst b/docs/installation.rst index a6a0789..5be94ab 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -35,7 +35,7 @@ rebuilding pyyaml. 1. Test if pyyaml is built with libyaml. This should work:: - python -c 'from yaml import CLoader' + python3 -c 'from yaml import CLoader' 2. Install libyaml according to your Linux distribution, or using `Homebrew `__ on Mac:: @@ -61,7 +61,7 @@ is to simply delete your cassettes and re-record all of them. VCR.py also provides a migration script that attempts to upgrade your 0.x cassettes to the new 1.x format. To use it, run the following command:: - python -m vcr.migration PATH + python3 -m vcr.migration PATH The PATH can be either a path to the directory with cassettes or the path to a single cassette. diff --git a/runtests.sh b/runtests.sh index f36f5cf..f219725 100755 --- a/runtests.sh +++ b/runtests.sh @@ -4,4 +4,4 @@ # If you are getting an INVOCATION ERROR for this script then there is # a good chance you are running on Windows. # You can and should use WSL for running tox on Windows when it calls bash scripts. -REQUESTS_CA_BUNDLE=`python -m pytest_httpbin.certs` exec pytest "$@" +REQUESTS_CA_BUNDLE=`python3 -m pytest_httpbin.certs` exec pytest "$@" diff --git a/vcr/migration.py b/vcr/migration.py index b72d78b..91f4af4 100644 --- a/vcr/migration.py +++ b/vcr/migration.py @@ -7,7 +7,7 @@ It merges and deletes the request obsolete keys (protocol, host, port, path) into new 'uri' key. Usage:: - python -m vcr.migration PATH + python3 -m vcr.migration PATH The PATH can be path to the directory with cassettes or cassette itself """ @@ -138,7 +138,7 @@ def try_migrate(path): def main(): if len(sys.argv) != 2: raise SystemExit( - "Please provide path to cassettes directory or file. " "Usage: python -m vcr.migration PATH" + "Please provide path to cassettes directory or file. " "Usage: python3 -m vcr.migration PATH" ) path = sys.argv[1] From d2f2731481143fcc543e17e43d971644827cf5d6 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sun, 18 Jun 2023 23:08:17 +0200 Subject: [PATCH 2/2] Replace command "pip" with "pip3" --- .github/workflows/main.yml | 4 ++-- docs/contributing.rst | 2 +- docs/installation.rst | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 78290da..6b7e743 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,8 +25,8 @@ jobs: - name: Install project dependencies run: | - pip install --upgrade pip - pip install codecov tox tox-gh-actions + pip3 install --upgrade pip + pip3 install codecov tox tox-gh-actions - name: Run tests with tox run: tox diff --git a/docs/contributing.rst b/docs/contributing.rst index a22236e..cf491ca 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -127,7 +127,7 @@ in this example:: eval "$(pyenv init -)" # Setup your local system tox tooling - pip install tox tox-pyenv + pip3 install tox tox-pyenv # Install supported versions (at time of writing), this does not activate them pyenv install 3.7.5 3.8.0 pypy3.8 diff --git a/docs/installation.rst b/docs/installation.rst index 5be94ab..21693e7 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -4,7 +4,7 @@ Installation VCR.py is a package on `PyPI `__, so you can install with pip:: - pip install vcrpy + pip3 install vcrpy Compatibility ------------- @@ -46,8 +46,8 @@ rebuilding pyyaml. 3. Rebuild pyyaml with libyaml:: - pip uninstall pyyaml - pip --no-cache-dir install pyyaml + pip3 uninstall pyyaml + pip3 --no-cache-dir install pyyaml Upgrade -------