summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2021-07-19 15:23:36 +0100
committerSimon McVittie <smcv@collabora.com>2021-07-19 15:25:31 +0100
commitc27536b1ae7575688ec3e57b4d1cfc525b7c4ce0 (patch)
treed5b5944f665ee86a583c22a6ed27dc2b387439cc
parentf191ba11065d68e24c2405728e1685e08cdd64ca (diff)
downloaddbus-python-c27536b1ae7575688ec3e57b4d1cfc525b7c4ce0.tar.gz
Remove Travis-CI integration
We're using Gitlab-CI now. Signed-off-by: Simon McVittie <smcv@collabora.com>
-rw-r--r--.travis.yml65
-rw-r--r--CONTRIBUTING.md2
-rw-r--r--Makefile.am1
-rwxr-xr-xtools/ci-build.sh25
4 files changed, 2 insertions, 91 deletions
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 62e671a..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright © 2016 Simon McVittie
-#
-# SPDX-License-Identifier: MIT
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation
-# files (the "Software"), to deal in the Software without
-# restriction, including without limitation the rights to use, copy,
-# modify, merge, publish, distribute, sublicense, and/or sell copies
-# of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-
-sudo: required
-dist: xenial
-language: python
-cache:
- pip: true
- directories:
- - $HOME/.ccache
-install:
- - test -z "$dbus_ci_system_python" || deactivate
- - ./tools/ci-install.sh
-python:
- - "3.6"
- - "3.6-dev"
- - "3.7-dev"
- - "3.8-dev"
- - "nightly"
-script:
- - PATH="/usr/lib/ccache:$PATH" ./tools/ci-build.sh
-
-matrix:
- include:
- - python: "2.7"
- env:
- dbus_ci_system_python=python
- - python: "2.7"
- env:
- dbus_ci_system_python=python-dbg
- - python: "3.5"
- env:
- dbus_ci_system_python=python3
- - python: "3.5"
- env:
- dbus_ci_system_python=python3-dbg
- - python: "3.7"
- env:
- ci_distro=debian ci_docker=debian:buster-slim ci_suite=buster dbus_ci_system_python=python3
- - python: "3.7"
- env:
- ci_distro=debian ci_docker=debian:buster-slim ci_suite=buster dbus_ci_system_python=python3-dbg
-
-# vim:set sw=2 sts=2 et:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 75937a6..7b1da64 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -165,7 +165,7 @@ so you should have an issue number or a merge request ID to refer to.
#### Pre-release steps
-* Make sure CI (currently Travis-CI and Gitlab) is passing
+* Make sure CI (currently Gitlab-CI) is passing
* Update `NEWS` and the version number in `configure.ac`, and commit them
#### Building and uploading the release
diff --git a/Makefile.am b/Makefile.am
index 5780cce..0fd75c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,6 @@ CLEANFILES = \
test/test-service.log \
$(NULL)
EXTRA_DIST = \
- .travis.yml \
AUTHORS \
CONTRIBUTING.md \
COPYING \
diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index d1dd528..ac82998 100755
--- a/tools/ci-build.sh
+++ b/tools/ci-build.sh
@@ -43,8 +43,6 @@ if [ -n "$ci_docker" ]; then
--env=ci_suite="${ci_suite}" \
--env=dbus_ci_parallel="${dbus_ci_parallel}" \
--env=dbus_ci_system_python="${dbus_ci_system_python-}" \
- --env=TRAVIS="${TRAVIS-}" \
- --env=TRAVIS_PYTHON_VERSION="${TRAVIS_PYTHON_VERSION-}" \
--privileged \
ci-image \
tools/ci-build.sh
@@ -70,27 +68,6 @@ if [ -n "$dbus_ci_system_python" ]; then
export PYTHON_LIBS="-lpython2.7_d"
;;
esac
-
-elif [ -n "$TRAVIS_PYTHON_VERSION" ]; then
- # Possibly in a virtualenv
- dbus_ci_bindir="$(python -c 'import sys; print(sys.prefix)')"/bin
- # The real underlying paths, even if we have a virtualenv
- # e.g. /opt/pythonwhatever/bin on travis-ci
- dbus_ci_real_bindir="$(python -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_var("BINDIR"))')"
- dbus_ci_real_libdir="$(python -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_var("LIBDIR"))')"
-
- # We want the virtualenv bindir for python itself, then the real bindir
- # for python[X.Y]-config (which isn't copied into the virtualenv, so we
- # risk picking up the wrong one from travis-ci's PATH if we don't
- # do this)
- export PATH="${dbus_ci_bindir}:${dbus_ci_real_bindir}:${PATH}"
- # travis-ci's /opt/pythonwhatever/lib isn't on the library search path
- export LD_LIBRARY_PATH="${dbus_ci_real_libdir}"
- # travis-ci's Python 2 library is static, so it raises warnings
- # about tmpnam_r and tempnam
- case "$TRAVIS_PYTHON_VERSION" in
- (2*) export LDFLAGS=-Wl,--no-fatal-warnings;;
- esac
fi
NOCONFIGURE=1 ./autogen.sh
@@ -102,7 +79,7 @@ e=0
--prefix="$prefix" \
${NULL}
) || e=1
-if [ "x$e" != x0 ] || [ -n "$TRAVIS" ]; then
+if [ "x$e" != x0 ]; then
cat "$builddir/config.log"
fi
test "x$e" = x0