Browse Source

update release script and travis

tags/1.4.0
Etienne Trimaille 4 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:
only:
- master

-before_install:
before_install:
- sudo apt-get -qq -y update

install:
- sudo apt-get install -y python-software-properties
- sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
- sudo apt-get update
- sudo apt-get install -y git qgis python-qgis xvfb python-nose python-coverage pyflakes python-nosexcover python-scientific python-beautifulsoup
- sudo apt-get install -y git qgis python-qgis xvfb python-nose python-coverage pyflakes python-nosexcover
- pip install --upgrade pip
- pip install --upgrade pep8
- pip install --upgrade pylint
@@ -31,7 +31,9 @@ before_script:

script:
- make pep8
- xvfb-run --server-args="-screen 0, 1024x768x24" nosetests -A 'not slow' -v --with-id --with-xcoverage --with-xunit --verbose --cover-package=core
- xvfb-run --server-args="-screen 0, 1024x768x24" nosetests -A 'not slow' -v --with-id --with-xcoverage --with-xunit --verbose --cover-package=core core


notifications:
email:
- etienne.trimaille@gmail.com

+ 1
- 1
Makefile View File

@@ -61,7 +61,7 @@ pep8:
@echo "PEP8 issues"
@echo "-----------"
@pep8 --version
@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
@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

pylint:
@echo

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

@@ -26,8 +26,7 @@ import unittest
# This import is to enable SIP API V2
# noinspection PyUnresolvedReferences
import qgis # pylint: disable=unused-import
from QuickOSM.test.utilities import get_qgis_app

from test.utilities import get_qgis_app
QGIS_APP, CANVAS, IFACE, PARENT = get_qgis_app()

from QuickOSM.core.query_factory import QueryFactory

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

@@ -26,8 +26,7 @@ import unittest
# This import is to enable SIP API V2
# noinspection PyUnresolvedReferences
import qgis # pylint: disable=unused-import
from QuickOSM.test.utilities import get_qgis_app

from test.utilities import get_qgis_app
QGIS_APP, CANVAS, IFACE, PARENT = get_qgis_app()

from qgis.core import QgsRectangle

+ 5
- 0
release.sh View File

@@ -4,10 +4,13 @@ echo "Make a zip"
cp -R QuickOSM/ QuickOSM_back/
rm QuickOSM.zip
cd QuickOSM/
git clean
git reset --HARD HEAD
make clean_pyc
find . -name "*.ui" -type f -delete
find . -name "*.qrc" -type f -delete
find . -name "*.ts" -type f -delete
find . -name "test" -type f -delete
rm -rf .git
rm -rf .idea
rm .gitignore
@@ -15,6 +18,8 @@ rm Makefile
rm QuickOSM.pro
rm README.md
rm release.sh
rm .travis.yml
rm .coverage

cd ..
zip -r QuickOSM QuickOSM/

Loading…
Cancel
Save