diff options
| author | James McCoy <jamessan@jamessan.com> | 2022-01-28 13:45:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-28 13:45:32 -0500 |
| commit | 6fd1b12de12d87a57e0c7c485f959805a1f996c3 (patch) | |
| tree | 0b8a8df991c98b887e41d8d43168f30b1d9a0d29 | |
| parent | b396387ec8c1377f07632f606dca7a3ac7b37a1b (diff) | |
| parent | b30ac599f83d6399f2f77f4139f448f722de7244 (diff) | |
| download | rneovim-6fd1b12de12d87a57e0c7c485f959805a1f996c3.tar.gz rneovim-6fd1b12de12d87a57e0c7c485f959805a1f996c3.tar.bz2 rneovim-6fd1b12de12d87a57e0c7c485f959805a1f996c3.zip | |
Merge pull request #17206 from dundargoc/ci/remove-python2
| -rwxr-xr-x | ci/common/submit_coverage.sh | 4 | ||||
| -rwxr-xr-x | ci/install.sh | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/ci/common/submit_coverage.sh b/ci/common/submit_coverage.sh index 9c7887de0b..cb6ab62b5b 100755 --- a/ci/common/submit_coverage.sh +++ b/ci/common/submit_coverage.sh @@ -18,12 +18,12 @@ if ! [ -f "$codecov_sh" ]; then curl --retry 5 --silent --fail -o "$codecov_sh" https://codecov.io/bash chmod +x "$codecov_sh" - python3 -m pip install --quiet --user gcovr + python -m pip install --quiet --user gcovr fi ( cd build - python3 -m gcovr --branches --exclude-unreachable-branches --print-summary -j 2 --exclude '.*/auto/.*' --root .. --delete -o ../coverage.xml --xml + python -m gcovr --branches --exclude-unreachable-branches --print-summary -j 2 --exclude '.*/auto/.*' --root .. --delete -o ../coverage.xml --xml ) # Upload to codecov. diff --git a/ci/install.sh b/ci/install.sh index bd42274b49..894e090de2 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -4,12 +4,8 @@ set -e set -o pipefail # Use default CC to avoid compilation problems when installing Python modules. -echo "Install neovim module for Python 3." -CC=cc python3 -m pip -q install --user --upgrade pynvim -if python2 -m pip -c True 2>&1; then - echo "Install neovim module for Python 2." - CC=cc python2 -m pip -q install --user --upgrade pynvim -fi +echo "Install neovim module for Python." +CC=cc python -m pip -q install --user --upgrade pynvim echo "Install neovim RubyGem." gem install --no-document --bindir "$HOME/.local/bin" --user-install --pre neovim |