aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrien Tétar2015-10-23 16:55:55 +0200
committerAdrien Tétar2015-10-23 16:55:55 +0200
commitff35576986cb7a1a954b0b67bf66ecf78b8f5f6d (patch)
treec57c5d01044e02e0cb712216dede183eeb0c5483
parent2a9853fb0120b5ca3f4bec7327a858f6066b3fbe (diff)
parent2fbcbda0768af21999b371dec52abe73cafa810b (diff)
downloadtrufont-ff35576986cb7a1a954b0b67bf66ecf78b8f5f6d.tar.bz2
Merge pull request #51 from moyogo/travis
Travis: run setup.py test
-rw-r--r--.travis.yml23
-rw-r--r--setup.py31
-rw-r--r--tests/__init__.py0
-rw-r--r--tests/defconQt/__init__.py0
4 files changed, 30 insertions, 24 deletions
diff --git a/.travis.yml b/.travis.yml
index cda1c99..ec7f327 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
+# use Ubuntu 14.04LTS trusty
+sudo: required
+dist: trusty
language: python
-python:
- - "3.4"
before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq -y python3-pyqt5 python3-flake8
@@ -8,14 +9,18 @@ before_install:
- git clone --depth=1 --branch=python3-ufo3 https://github.com/trufont/defcon
- git clone --depth=1 --branch=python3-ufo3 https://github.com/trufont/ufo2fdk
- git clone --depth=1 https://github.com/behdad/fonttools.git
+ - export PYTHONCMD=/usr/bin/python3
+ - cd fonttools; $PYTHONCMD setup.py install --user; cd ..
+ - cd defcon; $PYTHONCMD setup.py install --user; cd ..
+ - cd robofab; $PYTHONCMD setup.py install --user; cd ..
+ - cd ufo2fdk; $PYTHONCMD setup.py install --user; cd ..
install:
- - cd fonttools; python setup.py install; cd ..
- - cd defcon; python setup.py install; cd ..
- - cd robofab; python setup.py install; cd ..
- - cd ufo2fdk; python setup.py install; cd ..
+ - $PYTHONCMD setup.py install --user
+before_script:
+ - "export DISPLAY=:99.0"
+ - "sh -e /etc/init.d/xvfb start"
+ - sleep 3 # give xvfb some time to start
# commands to run tests
script:
- flake8 --config=setup.cfg Lib/defconQt
-# use Ubuntu 14.04LTS trusty
-sudo: required
-dist: trusty
+ - $PYTHONCMD setup.py test
diff --git a/setup.py b/setup.py
index 75664da..fc62279 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,5 @@
#!/usr/bin/env python
-# -*- coding: utf-8 -*-
# import sys
-
from setuptools import setup
try:
@@ -13,13 +11,15 @@ except:
try:
import robofab # noqa
except:
- print("*** Warning: trufont requires RoboFab (the python3-ufo3 branch), see:")
+ print("*** Warning: trufont requires RoboFab (the python3-ufo3 branch), "
+ "see:")
print(" https://github.com/trufont/robofab")
try:
- import defcon # noqa
+ import defcon # noqa
except:
- print("*** Warning: trufont requires defcon (the python3-ufo3 branch), see:")
+ print("*** Warning: trufont requires defcon (the python3-ufo3 branch), "
+ "see:")
print(" https://github.com/trufont/defcon")
# if "sdist" in sys.argv:
@@ -37,11 +37,11 @@ except:
# # remove doctrees
# shutil.rmtree(doctrees)
-
setup(
name="defconQt",
version="0.1.0",
- description="Trufont, a cross-platform font editor (a set of Qt interface objects for working with font data).",
+ description="Trufont, a cross-platform font editor (a set of Qt interface "
+ "objects for working with font data).",
author="Adrien Tétar",
author_email="adri-from-59@hotmail.fr",
url="http://trufont.github.io",
@@ -54,16 +54,17 @@ setup(
"defconQt.util",
],
entry_points={
- 'gui_scripts': [
+ "gui_scripts": [
"trufont = defconQt.__main__:main"
- ]
- },
+ ]
+ },
package_dir={"": "Lib"},
- platforms=["Linux","Win32","Mac OS X"],
+ platforms=["Linux", "Win32", "Mac OS X"],
classifiers=[
- "Environment :: GUI",
- "Programming Language :: Python :: 3.4",
- "Intended Audience :: Developers",
- "Topic :: Text Processing :: Fonts",
+ "Environment :: GUI",
+ "Programming Language :: Python :: 3.4",
+ "Intended Audience :: Developers",
+ "Topic :: Text Processing :: Fonts",
],
+ test_suite="tests",
)
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/__init__.py
diff --git a/tests/defconQt/__init__.py b/tests/defconQt/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/defconQt/__init__.py