From 7c8afe4e7f7cb34abae6ad08b7bfec7799b385bd Mon Sep 17 00:00:00 2001 From: Jacek Czaja Date: Sun, 6 Jan 2019 09:59:48 +0100 Subject: [PATCH 01/13] travis test --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6bb9f5a..6b824b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ language: python python: -- 2.7 +- 3.4 -install: +before_script: pip install --user -r requirements.txt script: From b5ac3f9d074aa7803dc91a5592db8f216392a356 Mon Sep 17 00:00:00 2001 From: Jacek Czaja Date: Sun, 6 Jan 2019 10:05:56 +0100 Subject: [PATCH 02/13] another attemt --- .travis.yml | 20 +++++++++++++++++++- requirements.txt | 1 - 2 files changed, 19 insertions(+), 2 deletions(-) delete mode 100644 requirements.txt diff --git a/.travis.yml b/.travis.yml index 6b824b5..27a5c4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,26 @@ language: python python: - 3.4 +branches: + only: + - master + before_script: -pip install --user -r requirements.txt +- cd .. +- curl -L -O http://sourceforge.net/projects/pyqt/files/sip/sip-4.14.1/sip-4.14.1.tar.gz +- tar -xvf sip-4.14.1.tar.gz +- cd sip-4.14.1 +- python configure.py +- make -j 2 +- sudo make install +- cd .. +- curl -L -O http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.9.5/PyQt-x11-gpl-4.9.5.tar.gz +- tar -xvf PyQt-x11-gpl-4.9.5.tar.gz +- cd PyQt-x11-gpl-4.9.5 +- python configure.py --confirm-license +- make -j 2 +- sudo make install +- cd ../equations script: - pytest diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index ecf3e95..0000000 --- a/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -PyQt4 From cf329d6825e27041e69e005ab4debca0e7889cf4 Mon Sep 17 00:00:00 2001 From: Jacek Czaja Date: Sun, 6 Jan 2019 10:17:28 +0100 Subject: [PATCH 03/13] yet another attemt --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 27a5c4d..f47c243 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: python python: -- 3.4 +- 2.7 branches: only: From ce83d096be1f19c451e501dfb13fd096ef534cc1 Mon Sep 17 00:00:00 2001 From: Jacek Czaja Date: Sun, 6 Jan 2019 10:42:30 +0100 Subject: [PATCH 04/13] yeta another fix to travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f47c243..388d5fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,6 @@ before_script: - cd ../equations script: -- pytest +- python -m pytest From 8d4ed70cb2c4c8a9d421c9c54113e024b5b8d662 Mon Sep 17 00:00:00 2001 From: Jacek Czaja Date: Sun, 6 Jan 2019 10:58:56 +0100 Subject: [PATCH 05/13] yeta another fix to travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 388d5fa..49181d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ before_script: - make -j 2 - sudo make install - cd ../equations +- pip install --user -r requirements.txt script: - python -m pytest From 4934fbcf2891c57f822b4cfad2fdda86033a9522 Mon Sep 17 00:00:00 2001 From: Jacek Czaja Date: Sun, 6 Jan 2019 11:28:11 +0100 Subject: [PATCH 06/13] yeta another fix to travis --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 49181d8..1c12ccc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ branches: only: - master -before_script: +before_install: - cd .. - curl -L -O http://sourceforge.net/projects/pyqt/files/sip/sip-4.14.1/sip-4.14.1.tar.gz - tar -xvf sip-4.14.1.tar.gz @@ -23,6 +23,8 @@ before_script: - make -j 2 - sudo make install - cd ../equations + +install: - pip install --user -r requirements.txt script: From cacdd7707be4d92b553a984a30ded72113f175d2 Mon Sep 17 00:00:00 2001 From: Jacek Czaja Date: Sun, 6 Jan 2019 11:58:34 +0100 Subject: [PATCH 07/13] - Another fix to travic --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1c12ccc..bda3572 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ before_install: - cd ../equations install: -- pip install --user -r requirements.txt +- sudo pip install pytest-qt script: - python -m pytest From 20b8a2dc59de884eb627fe66aa01cdf5cb8dde2c Mon Sep 17 00:00:00 2001 From: Jacek Czaja Date: Sun, 6 Jan 2019 12:03:22 +0100 Subject: [PATCH 08/13] - another fix to t travis --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index bda3572..4f9b17a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ branches: only: - master -before_install: +before_script: - cd .. - curl -L -O http://sourceforge.net/projects/pyqt/files/sip/sip-4.14.1/sip-4.14.1.tar.gz - tar -xvf sip-4.14.1.tar.gz @@ -23,8 +23,6 @@ before_install: - make -j 2 - sudo make install - cd ../equations - -install: - sudo pip install pytest-qt script: From 1146c5eab7c03fe660c1b818e79f21963a13c1a0 Mon Sep 17 00:00:00 2001 From: Jacek Czaja Date: Sun, 6 Jan 2019 12:09:45 +0100 Subject: [PATCH 09/13] yeta another fix to travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4f9b17a..3fa83af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,14 +10,14 @@ branches: before_script: - cd .. - curl -L -O http://sourceforge.net/projects/pyqt/files/sip/sip-4.14.1/sip-4.14.1.tar.gz -- tar -xvf sip-4.14.1.tar.gz +- tar -xvzf sip-4.14.1.tar.gz - cd sip-4.14.1 - python configure.py - make -j 2 - sudo make install - cd .. - curl -L -O http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.9.5/PyQt-x11-gpl-4.9.5.tar.gz -- tar -xvf PyQt-x11-gpl-4.9.5.tar.gz +- tar -xvzf PyQt-x11-gpl-4.9.5.tar.gz - cd PyQt-x11-gpl-4.9.5 - python configure.py --confirm-license - make -j 2 From 1e1da10d338d101242b3ac482c938589de8a2c8f Mon Sep 17 00:00:00 2001 From: Jacek Czaja Date: Sun, 6 Jan 2019 12:33:44 +0100 Subject: [PATCH 10/13] yeta another fix to travis --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3fa83af..8111523 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,9 @@ language: python python: - 2.7 +os: linux +distro: xenial + branches: only: - master @@ -10,6 +13,7 @@ branches: before_script: - cd .. - curl -L -O http://sourceforge.net/projects/pyqt/files/sip/sip-4.14.1/sip-4.14.1.tar.gz +- ls - tar -xvzf sip-4.14.1.tar.gz - cd sip-4.14.1 - python configure.py From 87811f9bdc1875e5cb4b14801ff82c28080ffaba Mon Sep 17 00:00:00 2001 From: Jacek Czaja Date: Sun, 6 Jan 2019 12:50:06 +0100 Subject: [PATCH 11/13] - another fix travis --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8111523..e1458e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,8 +27,7 @@ before_script: - make -j 2 - sudo make install - cd ../equations -- sudo pip install pytest-qt - +- pip install --user pytest-qt script: - python -m pytest From 68c696a22414a8eb3a8a1f652ec95dd361aa800d Mon Sep 17 00:00:00 2001 From: Jacek Czaja Date: Sun, 6 Jan 2019 13:05:38 +0100 Subject: [PATCH 12/13] - yeta noather travis test --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e1458e1..c931d2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,9 @@ branches: only: - master +virtualenv: + system_site_packages: true + before_script: - cd .. - curl -L -O http://sourceforge.net/projects/pyqt/files/sip/sip-4.14.1/sip-4.14.1.tar.gz @@ -27,7 +30,7 @@ before_script: - make -j 2 - sudo make install - cd ../equations -- pip install --user pytest-qt +- sudo pip install pytest-qt script: - python -m pytest From ff1c2790f3886ead07e4469583a87526923c8ecd Mon Sep 17 00:00:00 2001 From: Jacek Czaja Date: Sun, 6 Jan 2019 13:18:27 +0100 Subject: [PATCH 13/13] - yet another travis adjustment --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c931d2b..ac0bce7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,6 @@ before_script: - cd ../equations - sudo pip install pytest-qt script: -- python -m pytest +- pytest --verbose