From 5457e012f25129d2279b173148e4440b03dea0b1 Mon Sep 17 00:00:00 2001
From: Rico Tiongson <thericotiongson@gmail.com>
Date: Tue, 5 Mar 2019 17:58:36 +0800
Subject: [PATCH] Attempt fix travis configuration

---
 .travis.yml      | 22 ++++++++++++----------
 requirements.txt |  1 -
 setup.cfg        |  2 ++
 setup.py         |  7 ++++---
 4 files changed, 18 insertions(+), 14 deletions(-)
 create mode 100644 setup.cfg

diff --git a/.travis.yml b/.travis.yml
index 52438f4..cb44900 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,21 @@
+dist: xenial
 language: python
+sudo: required
 python:
-  - "2.6"
-  - "2.7"
-  - "3.3"
-  - "3.4"
-  - "3.5"
-  - "3.6"
-  - "3.7"
-  - "3.8-dev"
+  - 2.7
+  - 3.5
+  - 3.6
+  - 3.7
+  - 3.8
 addons:
   apt:
+    update: true
+    sources:
+      - ubuntu-toolchain-r-test
     packages:
       - libxdo-dev
       - libinput-tools
 install:
-  - pip install . -vv
+  - pip install .
 script:
-  - python setup.py test -vv
+  - python setup.py test
diff --git a/requirements.txt b/requirements.txt
index aff220d..e69de29 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +0,0 @@
-psutil==5.5.1
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..066439e
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[build]
+compiler = unix
diff --git a/setup.py b/setup.py
index f3e4b37..2d8ae21 100644
--- a/setup.py
+++ b/setup.py
@@ -49,12 +49,15 @@ try:
         COMFORTABLE_SWIPE_CONFIG='"{}"'.format(CONFIG)
     )
 
+    # make sure to use gnu-gcc
+    os.putenv('CC', 'x86_64-linux-gnu-gcc')
+
     # read C++ libraries for comfortable swipe
     extensions = [Extension(
         name='{}.cpp.{}'.format(PYTHON_NAME, extension_name),
         define_macros=list(cpp_macros.items()),
         sources=[os.path.join('cpp', '_python.cpp')],
-        extra_compile_args=['-O2', '-Wno-unused-result'],
+        extra_compile_args=['-O2', '-Wno-unused-result', '-std=c++11', '-lstdc++'],
         libraries=['xdo']
     ) for extension_name in extension_names]
 
@@ -139,8 +142,6 @@ try:
     with open('requirements.txt', 'r') as requirements:
         install_requires = requirements.read().splitlines()
 
-    print(install_requires)
-
     # setup python script
     setup_script = setup(
         name=NAME,