Merge pull request #3847 from mwichmann/py39-travis

Switch travis-ci 3.9 to released + 20.04

7 files changed, 21 insertions, 30 deletions

diff --git a/.travis.yml b/.travis.yml
index 10bc138..bdf3e0c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,8 +59,8 @@ jobs:
       dist: bionic  # required for Python >= 3.8
 
     - <<: *test_job
-      python: 3.9-dev
-      dist: bionic  # required for Python >= 3.8
+      python: 3.9
+      dist: focal  # required for Python >= 3.8
 
     - &coverage_jobs
       dist: bionic
@@ -77,19 +77,3 @@ jobs:
         - coverage report
         - coverage xml -i -o coverage_xml.xml
         - codecov -X gcov --file coverage_xml.xml
-
-    - &scons_build_job
-      name: SCons Build
-      python: 3.7
-      install:
-        - sudo apt-get -y install docbook-xml docbook-xsl xsltproc libxml2-dev libxslt-dev fop docbook-xsl-doc-pdf
-        - sudo apt-get -y --no-install-recommends install texlive texlive-latex3 biber texmaker ghostscript texlive-bibtex-extra texlive-latex-extra texlive-font-utils latexmk
-        - pip install -r requirements.txt
-      script:
-        - python bin/docs-update-generated.py
-        - python bin/docs-validate.py
-        - python bin/docs-create-example-outputs.py
-        - python scripts/scons.py
-        - ls -l build/dist
-        - python build/scons-local/scons.py --version
-        - ./.travis/verify_packages.sh
diff --git a/.travis/install.sh b/.travis/install.sh
index 92c80c8..2c1d6f5 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -50,11 +50,13 @@ else
 #    sudo apt-get update && sudo apt-get -y --allow-unauthenticated install dmd-bin
 
     # dependencies for ldc tests
-    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/* /
+    # this install method basically worked until 20.04, though a little messy.
+    # rather than further tweaking, replace it with the recommended snap install
+    #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
+    #tar xf ldc2-${SCONS_LDC_VERSION}-linux-x86_64.tar.xz
+    #sudo cp -rf ldc2-${SCONS_LDC_VERSION}-linux-x86_64/* /
+    sudo snap install ldc2 --classic
 
     # Failing.. ?
 #    ls -l /usr/lib*/*python*{so,a}*
diff --git a/CHANGES.txt b/CHANGES.txt
index 868a6d9..47d7d06 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -108,7 +108,9 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - Fix Issue #3014 - Empty file and missing file have same csig
     - Refactor env.Append/Prepend to remove Py 1.5 era need to nest
       try blocks, can now "continue" at the appropriate places.
-
+    - Add /snap/bin to env['PATH'] on POSIX, although this is only
+      really useful for a subset of POSIX systems that use snaps.
+      Was needed for CI builds, which run on Ubuntu LTS images.
 
 
 RELEASE 4.0.1 - Mon, 16 Jul 2020 16:06:40 -0700
diff --git a/RELEASE.txt b/RELEASE.txt
index a9f286e..df76cde 100755
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -40,7 +40,9 @@
   CHANGED/ENHANCED EXISTING FUNCTIONALITY
 
     - Environment.SideEffect() no longer adds duplicate side effects.
-      NOTE: The list of returned side effect Nodes will not include any duplicate side effect Nodes.
+      NOTE: The list of returned side effect Nodes will not include any
+      duplicate side effect Nodes.
+    - /snap/bin is added to the default search path for the 'posix' platform.
 
   FIXES
 
diff --git a/SCons/Platform/posix.py b/SCons/Platform/posix.py
index 4a5db10..4c9f8f9 100644
--- a/SCons/Platform/posix.py
+++ b/SCons/Platform/posix.py
@@ -84,7 +84,7 @@ def generate(env):
 
     if 'ENV' not in env:
         env['ENV']        = {}
-    env['ENV']['PATH']    = '/usr/local/bin:/opt/bin:/bin:/usr/bin'
+    env['ENV']['PATH']    = '/usr/local/bin:/opt/bin:/bin:/usr/bin:/snap/bin'
     env['OBJPREFIX']      = ''
     env['OBJSUFFIX']      = '.o'
     env['SHOBJPREFIX']    = '$OBJPREFIX'
diff --git a/doc/user/environments.xml b/doc/user/environments.xml
index 40bcd31..5bcffbc 100644
--- a/doc/user/environments.xml
+++ b/doc/user/environments.xml
@@ -1770,7 +1770,7 @@ void main() {
 
       The default value of the &PATH; environment variable
       on a POSIX system
-      is <literal>/usr/local/bin:/bin:/usr/bin</literal>.
+      is <literal>/usr/local/bin:/opt/bin:/bin:/usr/bin:/snap/bin</literal>.
       The default value of the &PATH; environment variable
       on a Windows system comes from the Windows registry
       value for the command interpreter.
diff --git a/test/D/HSTeoh/Common/singleStringCannotBeMultipleOptions.py b/test/D/HSTeoh/Common/singleStringCannotBeMultipleOptions.py
index 2632f87..cc1dc4f 100644
--- a/test/D/HSTeoh/Common/singleStringCannotBeMultipleOptions.py
+++ b/test/D/HSTeoh/Common/singleStringCannotBeMultipleOptions.py
@@ -1,6 +1,7 @@
 """
-These tests verify that SCons fails appropriately where the user has tried to supply multiple command line
-options via a single string rather than providing a list of strings, one string per option.
+These tests verify that SCons fails appropriately where the user has
+tried to supply multiple command line options via a single string rather
+than providing a list of strings, one string per option.
 """
 
 #
@@ -53,7 +54,7 @@ def testForTool(tool):
 
     result = {
         'dmd': ".*unrecognized switch '-m64 -O'.*",
-        'gdc': ".*unrecognized command line option.*",
+        'gdc': ".*unrecognized command.line option.*",
         'ldc': ".*Unknown command line argument '-m64 -O'.*",
         }[tool]