Browse Source

update release script and travis

tags/1.4.0
Etienne Trimaille 3 years ago
parent
commit
1d2ad46494
5 changed files with 13 additions and 8 deletions
  1. 5
    3
      .travis.yml
  2. 1
    1
      Makefile
  3. 1
    2
      core/test/test_query_factory.py
  4. 1
    2
      core/test/test_query_parser.py
  5. 5
    0
      release.sh

+ 5
- 3
.travis.yml View File

@@ -10,14 +10,14 @@ branches:
10 10
   only:
11 11
     - master
12 12
 
13
--before_install:
13
+before_install:
14 14
   - sudo apt-get -qq -y update
15 15
 
16 16
 install:
17 17
   - sudo apt-get install -y python-software-properties
18 18
   - sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
19 19
   - sudo apt-get update
20
-  - sudo apt-get install -y git qgis python-qgis xvfb python-nose python-coverage pyflakes python-nosexcover python-scientific python-beautifulsoup
20
+  - sudo apt-get install -y git qgis python-qgis xvfb python-nose python-coverage pyflakes python-nosexcover
21 21
   - pip install --upgrade pip
22 22
   - pip install --upgrade pep8
23 23
   - pip install --upgrade pylint
@@ -31,7 +31,9 @@ before_script:
31 31
 
32 32
 script:
33 33
   - make pep8
34
-  - xvfb-run --server-args="-screen 0, 1024x768x24" nosetests -A 'not slow' -v --with-id --with-xcoverage --with-xunit --verbose --cover-package=core
34
+  - xvfb-run --server-args="-screen 0, 1024x768x24" nosetests -A 'not slow' -v --with-id --with-xcoverage --with-xunit --verbose --cover-package=core core
35 35
 
36
+
37
+notifications:
36 38
   email:
37 39
     - etienne.trimaille@gmail.com

+ 1
- 1
Makefile View File

@@ -61,7 +61,7 @@ pep8:
61 61
 	@echo "PEP8 issues"
62 62
 	@echo "-----------"
63 63
 	@pep8 --version
64
-	@pep8 --repeat --exclude test/qgis_interface.py,test/utilities.py,resources_rc.py,./ui/main_window.py,./ui/my_queries.py,./ui/osm_file.py,./ui/save_query.py,./ui/query.py,./ui/quick_query.py . || true
64
+	@pep8 --repeat --ignore=E203,E121,E122,E123,E124,E125,E126,E127,E128,E402 --exclude test/qgis_interface.py,test/utilities.py,resources_rc.py,./ui/main_window.py,./ui/my_queries.py,./ui/osm_file.py,./ui/save_query.py,./ui/query.py,./ui/quick_query.py . || true
65 65
 
66 66
 pylint:
67 67
 	@echo

+ 1
- 2
core/test/test_query_factory.py View File

@@ -26,8 +26,7 @@ import unittest
26 26
 # This import is to enable SIP API V2
27 27
 # noinspection PyUnresolvedReferences
28 28
 import qgis  # pylint: disable=unused-import
29
-from QuickOSM.test.utilities import get_qgis_app
30
-
29
+from test.utilities import get_qgis_app
31 30
 QGIS_APP, CANVAS, IFACE, PARENT = get_qgis_app()
32 31
 
33 32
 from QuickOSM.core.query_factory import QueryFactory

+ 1
- 2
core/test/test_query_parser.py View File

@@ -26,8 +26,7 @@ import unittest
26 26
 # This import is to enable SIP API V2
27 27
 # noinspection PyUnresolvedReferences
28 28
 import qgis  # pylint: disable=unused-import
29
-from QuickOSM.test.utilities import get_qgis_app
30
-
29
+from test.utilities import get_qgis_app
31 30
 QGIS_APP, CANVAS, IFACE, PARENT = get_qgis_app()
32 31
 
33 32
 from qgis.core import QgsRectangle

+ 5
- 0
release.sh View File

@@ -4,10 +4,13 @@ echo "Make a zip"
4 4
 cp -R QuickOSM/ QuickOSM_back/
5 5
 rm QuickOSM.zip
6 6
 cd QuickOSM/
7
+git clean
8
+git reset --HARD HEAD
7 9
 make clean_pyc
8 10
 find . -name "*.ui" -type f -delete
9 11
 find . -name "*.qrc" -type f -delete
10 12
 find . -name "*.ts" -type f -delete
13
+find . -name "test" -type f -delete
11 14
 rm -rf .git
12 15
 rm -rf .idea
13 16
 rm .gitignore
@@ -15,6 +18,8 @@ rm Makefile
15 18
 rm QuickOSM.pro
16 19
 rm README.md
17 20
 rm release.sh
21
+rm .travis.yml
22
+rm .coverage
18 23
 
19 24
 cd ..
20 25
 zip -r QuickOSM QuickOSM/

Loading…
Cancel
Save