From 41bb0ffdb731767f7d251a8fa314820d02aa9c44 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 18 May 2020 10:19:01 -0700 Subject: Add py3.9 dev --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index d2f06be..122e8d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,6 +58,10 @@ jobs: python: 3.8 dist: bionic # required for Python >= 3.8 + - <<: *test_job + python: 3.9-dev + dist: bionic # required for Python >= 3.8 + - &coverage_jobs dist: bionic python: 3.7 -- cgit v0.12 From e17c6fee560cc6cdc14893f5b3453a8a4664bb05 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 18 May 2020 10:19:19 -0700 Subject: Update LDC version, remove py27 bits, add rpm --- .travis/install.sh | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index 64a300b..29b9caa 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -19,6 +19,9 @@ else sudo ln -s /usr/local/clang-5.0.0/bin/clang++ /usr/bin/clang++ fi + # dependencies for rpm packaging tests + sudo apt-get -y install rpm + # dependencies for gdc tests sudo apt-get -y install gdc @@ -42,17 +45,11 @@ else sudo apt-get update && sudo apt-get -y --allow-unauthenticated install dmd-bin # dependencies for ldc tests - wget https://github.com/ldc-developers/ldc/releases/download/v1.15.0/ldc2-1.15.0-linux-x86_64.tar.xz - tar xf ldc2-1.15.0-linux-x86_64.tar.xz - sudo cp -rf ldc2-1.15.0-linux-x86_64/* / + export SCONS_LDC_VERSION=1.21.0 + wget https://github.com/ldc-developers/ldc/releases/download/v${SCONS_LDC_VERSION}/ldc2-${SCONS_LDC_VERSION}-linux-x86_64.tar.xz +# wget https://github.com/ldc-developers/ldc/releases/download/v1.15.0/ldc2-1.15.0-linux-x86_64.tar.xz + tar xf ldc2-${SCONS_LDC_VERSION}-linux-x86_64.tar.xz + sudo cp -rf ldc2-${SCONS_LDC_VERSION}-linux-x86_64/* / ls -l /usr/lib/*python*{so,a}* - - # For now skip swig if py27 - if [[ "$PYVER" == 27 ]]; then - # dependencies for swig tests - wget https://github.com/swig/swig/archive/rel-3.0.12.tar.gz - tar xzf rel-3.0.12.tar.gz - cd swig-rel-3.0.12 && ./autogen.sh && ./configure --prefix=/usr && make && sudo make install && cd .. - fi fi -- cgit v0.12 From 047975c68b4b74bebacb4721dbfcb472ec2b8715 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 18 May 2020 10:27:46 -0700 Subject: update path we look for python libs --- .travis/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/install.sh b/.travis/install.sh index 29b9caa..843f3b6 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -51,5 +51,5 @@ else tar xf ldc2-${SCONS_LDC_VERSION}-linux-x86_64.tar.xz sudo cp -rf ldc2-${SCONS_LDC_VERSION}-linux-x86_64/* / - ls -l /usr/lib/*python*{so,a}* + ls -l /usr/lib*/*python*{so,a}* fi -- cgit v0.12 From fec871dbdd03de409f93f5c2b64005bb9f4c17c3 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 18 May 2020 10:40:28 -0700 Subject: Update base ubuntu from trusty(14.04)->xenial(16.04), update install logic for dmd --- .travis.yml | 2 +- .travis/install.sh | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 122e8d1..f0d1b45 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -dist: trusty +dist: xenial language: python # Used: travis encrypt "chat.freenode.net#scons" --add notifications.irc diff --git a/.travis/install.sh b/.travis/install.sh index 843f3b6..2c07fc8 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -40,9 +40,14 @@ else sudo apt-get -y install python-pip python-dev build-essential libpcre3-dev autoconf automake libtool bison subversion git # dependencies for D tests - sudo wget http://master.dl.sourceforge.net/project/d-apt/files/d-apt.list -O /etc/apt/sources.list.d/d-apt.list - wget -qO - https://dlang.org/d-keyring.gpg | sudo apt-key add - - sudo apt-get update && sudo apt-get -y --allow-unauthenticated install dmd-bin + sudo wget https://netcologne.dl.sourceforge.net/project/d-apt/files/d-apt.list -O /etc/apt/sources.list.d/d-apt.list + sudo apt-get update --allow-insecure-repositories + sudo apt-get -y --allow-unauthenticated install --reinstall d-apt-keyring + sudo apt-get update && sudo apt-get install dmd-compiler dub + +# sudo wget http://master.dl.sourceforge.net/project/d-apt/files/d-apt.list -O /etc/apt/sources.list.d/d-apt.list +# wget -qO - https://dlang.org/d-keyring.gpg | sudo apt-key add - +# sudo apt-get update && sudo apt-get -y --allow-unauthenticated install dmd-bin # dependencies for ldc tests export SCONS_LDC_VERSION=1.21.0 -- cgit v0.12 From 49ebf1eda47c4a44b0717ff52b863d52f3eb5ab2 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 18 May 2020 10:49:26 -0700 Subject: not sure why 'ls -l /usr/lib*/*python*{so,a}*' is failing on these systems.. but commenting out --- .travis/install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis/install.sh b/.travis/install.sh index 2c07fc8..25660c0 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -56,5 +56,6 @@ else tar xf ldc2-${SCONS_LDC_VERSION}-linux-x86_64.tar.xz sudo cp -rf ldc2-${SCONS_LDC_VERSION}-linux-x86_64/* / - ls -l /usr/lib*/*python*{so,a}* + # Failing.. ? +# ls -l /usr/lib*/*python*{so,a}* fi -- cgit v0.12 From a17a722ff8f79ea3027944b44914f7367873b4cf Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 18 May 2020 10:56:14 -0700 Subject: update to lxml 4.5.0 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f0d1b45..c31b1fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ os: install: # needed for Docbook tests, must be in virtualenv context - - pip install lxml==4.3.3 + - pip install lxml==4.5.0 # do the rest of the image setup - ./.travis/install.sh -- cgit v0.12 From 4a0cd4864a82803c414023e69e5ba9419c295309 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 18 May 2020 11:22:30 -0700 Subject: change test to change expected line # depending on python version --- test/packaging/rpm/explicit-target.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/packaging/rpm/explicit-target.py b/test/packaging/rpm/explicit-target.py index 0cf486e..66f5e4a 100644 --- a/test/packaging/rpm/explicit-target.py +++ b/test/packaging/rpm/explicit-target.py @@ -30,6 +30,7 @@ Test the ability to create a rpm package from a explicit target name. import os import TestSCons +import sys _python_ = TestSCons._python_ @@ -75,9 +76,15 @@ env.Package( NAME = 'foo', ) """ % locals()) + +if sys.version_info.minor >= 8: + line_number = 12 +else: + line_number = 23 + expect = """ scons: *** Setting target is not supported for rpm. -""" + test.python_file_line(test.workpath('SConstruct'), 12) +""" + test.python_file_line(test.workpath('SConstruct'), line_number) test.run(arguments='', status=2, stderr=expect) -- cgit v0.12