Merge pull request #156 from iMichka/ci

Update CI to ubuntu 20.04

Author: iMichka

Diff for: .github/workflows/tests.yml

@@ -8,49 +8,41 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-18.04
+          - os: ubuntu-20.04
             compiler: gcc
-            version: "7"
-            python-version: 3.5
-            castxml: "castxml"
-            castxml-epic: 0
-            cppstd: "-std=c++98"
-
-          - os: ubuntu-18.04
-            compiler: gcc
-            version: "7"
+            version: "9"
             python-version: 3.6
             castxml: "castxml"
             castxml-epic: 0
             cppstd: "-std=c++98"
 
-          - os: ubuntu-18.04
+          - os: ubuntu-20.04
             compiler: gcc
-            version: "7"
+            version: "9"
             python-version: 3.7
             castxml: "castxml"
             castxml-epic: 0
             cppstd: "-std=c++98"
 
-          - os: ubuntu-18.04
+          - os: ubuntu-20.04
             compiler: gcc
-            version: "7"
+            version: "9"
             python-version: 3.8
             castxml: "castxml"
             castxml-epic: 0
             cppstd: "-std=c++98"
 
-          - os: ubuntu-18.04
+          - os: ubuntu-20.04
             compiler: gcc
-            version: "7"
+            version: "9"
             python-version: 3.8
             castxml: "castxml"
             castxml-epic: 1
             cppstd: "-std=c++98"
 
-          - os: ubuntu-18.04
+          - os: ubuntu-20.04
             compiler: gcc
-            version: "7"
+            version: "9"
             python-version: 3.8
             castxml: "castxml"
             castxml-epic: 1
@@ -73,16 +65,16 @@ jobs:
       - name: Display Python version
         run: python -c "import sys; print(sys.version)"
       - name: Setup castxml for Linux
-        if: matrix.os == 'ubuntu-18.04' && matrix.castxml == 'castxml'
+        if: matrix.os == 'ubuntu-20.04' && matrix.castxml == 'castxml'
         run: |
           wget -q -O - https://data.kitware.com/api/v1/file/hashsum/sha512/bdbb67a10c5f8d1b738cd19cb074f409d4803e8077cb8c1072ef4eaf738fa871a73643f9c8282d58cae28d188df842c82ad6620b6d590b0396a0172a27438dce/download | tar zxf - -C ~/
       - name: Setup castxml for Mac
         if: matrix.os == 'macos-latest'
         run: |
           wget -q -O - https://data.kitware.com/api/v1/file/hashsum/sha512/5d937e938f7b882a3a3e7941e68f8312d0898aaf2082e00003dd362b1ba70b98b0a08706a1be28e71652a6a0f1e66f89768b5eaa20e5a100592d5b3deefec3f0/download | tar zxf - -C ~/
       - name: Setup castxml config
-        if: matrix.compiler == 'gcc' && matrix.version == '7'
-        run: mv unittests/configs/gcc7.cfg unittests/xml_generator.cfg;
+        if: matrix.compiler == 'gcc' && matrix.version == '9'
+        run: mv unittests/configs/gcc9.cfg unittests/xml_generator.cfg;
       - name: Install Python lib and test libs
         run: |
           pip install .[test]

Diff for: CHANGELOG.md

@@ -1,6 +1,11 @@
 Changes
 =======
 
+Next version
+------------
+
+1. Drop support for ```Python 3.5```
+
 Version 2.2.1
 -------------
 

Diff for: README.rst

@@ -27,7 +27,7 @@ Install instructions can be found `here <http://pygccxml.readthedocs.io/en/maste
 Compatibility
 -------------
 
-pygccxml is compatible with Python 3.5, 3.6, 3.7, 3.8 and pypy3.
+pygccxml is compatible with Python 3.6, 3.7, 3.8 and pypy3.
 
 Documentation and examples
 --------------------------

Diff for: pygccxml/parser/source_reader.py

@@ -116,7 +116,7 @@ def __create_command_line_castxml(self, source_file, xmlfile):
 
         # Always require a compiler path at this point
         if self.__config.compiler_path is None:
-            raise(RuntimeError(
+            raise (RuntimeError(
                 "Please pass the compiler_path as argument to " +
                 "your xml_generator_configuration_t(), or add it to your " +
                 "pygccxml configuration file."))

Diff for: setup.py

@@ -50,7 +50,6 @@
           "Operating System :: MacOS :: MacOS X",
           "Operating System :: Microsoft :: Windows",
           "Operating System :: POSIX",
-          "Programming Language :: Python :: 3.5",
           "Programming Language :: Python :: 3.6",
           "Programming Language :: Python :: 3.7",
           "Programming Language :: Python :: 3.8",

Diff for: unittests/configs/gcc7.cfg

@@ -0,0 +1,4 @@
+[xml_generator]
+compiler=/usr/bin/gcc-9
+cflags=-std=c++98
+include_paths=/usr/lib/gcc/x86_64-linux-gnu/9

Diff for: unittests/configs/gcc9.cfg

@@ -47,9 +47,9 @@ def __test_correctness_impl(self, file_name):
                         os.path.join(bdir, file_name + '.pr.txt'), 'w+') as pr:
 
                     declarations.print_declarations(
-                        s, writer=lambda l: sr.write(l + os.linesep))
+                        s, writer=lambda x: sr.write(l + os.linesep))
                     declarations.print_declarations(
-                        p, writer=lambda l: pr.write(l + os.linesep))
+                        p, writer=lambda x: pr.write(l + os.linesep))
 
             self.fail(
                 "There is a difference between declarations in file %s." %