1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00

Skip all python2 tests by default

python2 is deprecated
This commit is contained in:
Juhani Numminen 2021-02-07 13:41:57 +02:00
parent 6a55a0b262
commit 2412d58fcd
4 changed files with 1 additions and 15 deletions

View file

@ -7,13 +7,6 @@ osx_image: xcode12.2
addons: addons:
apt: apt:
- cpanminus - cpanminus
- python-glade2
- python-gnome2
- python-gnome2-dev
- python-gtk2
- python-pip
- python-setuptools
- python-tk
- python3-pip - python3-pip
- python3-setuptools - python3-setuptools
- python3-tk - python3-tk
@ -57,9 +50,6 @@ install:
- if test "$TRAVIS_OS_NAME" = "osx" ; then export PY_MODS="--no-binary=Pillow Pillow $PY_MODS" ; fi - if test "$TRAVIS_OS_NAME" = "osx" ; then export PY_MODS="--no-binary=Pillow Pillow $PY_MODS" ; fi
- sudo -H pip3 install --upgrade wheel - sudo -H pip3 install --upgrade wheel
- sudo -H pip3 install --upgrade $PY_MODS flake8 flake8-import-order - sudo -H pip3 install --upgrade $PY_MODS flake8 flake8-import-order
- if test "$TRAVIS_OS_NAME" = "linux" ; then
sudo -H pip2 install --upgrade wheel &&
sudo -H pip2 install --upgrade $PY_MODS ; fi
script: script:
- export TIDYALL_DATA_DIR="$HOME/tidyall_d" - export TIDYALL_DATA_DIR="$HOME/tidyall_d"
- bash -x scripts/travis-ci-build - bash -x scripts/travis-ci-build

View file

@ -14,7 +14,7 @@ def _has_tag(tag):
return re.search("\\b{}\\b".format(tag), TEST_TAGS) return re.search("\\b{}\\b".format(tag), TEST_TAGS)
PY_VERS = ([] if _has_tag('SKIP_PY2') else [2])+[3] PY_VERS = ([2] if _has_tag('WITH_PY2') else [])+[3]
SKIP_GTK = _has_tag('SKIP_GTK') SKIP_GTK = _has_tag('SKIP_GTK')
module_names = [] module_names = []
for d, _, files in os.walk("pysollib"): for d, _, files in os.walk("pysollib"):

View file

@ -17,7 +17,6 @@ from subprocess import check_call
def main(): def main():
os.environ['TEST_TAGS'] = " SKIP_GTK SKIP_PY2 "
try: try:
subprocess.check_call(["gmake", "test", "rules"]) subprocess.check_call(["gmake", "test", "rules"])
except subprocess.CalledProcessError: except subprocess.CalledProcessError:

View file

@ -7,9 +7,6 @@ proc_path()
PATH="$(perl -lE 'my @p = split/:/,$ENV{PATH}; print join q#:#, grep { ! m#\A/opt/python# } @p;')" "$@" PATH="$(perl -lE 'my @p = split/:/,$ENV{PATH}; print join q#:#, grep { ! m#\A/opt/python# } @p;')" "$@"
} }
if [ "x${TRAVIS_OS_NAME}" = "xosx" ]; then
export TEST_TAGS=SKIP_PY2
fi
make test make test
make dist make dist
tar -xvf dist/PySolFC-*.tar.xz tar -xvf dist/PySolFC-*.tar.xz