Skip to content
This repository was archived by the owner on Jun 20, 2024. It is now read-only.

Commit 7594092

Browse files
Merge pull request #84 from SethMichaelLarson/travis-ci
Add continuous integration via Travis CI
2 parents 308a3ff + c6a7c0e commit 7594092

6 files changed

Lines changed: 94 additions & 9 deletions

File tree

.travis.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
language: python
2+
sudo: false
3+
4+
matrix:
5+
include:
6+
# Lint
7+
- python: 2.7
8+
env: TOXENV=lint
9+
- python: 3.6
10+
env: TOXENV=lint
11+
12+
# Docs
13+
- python: 3.6
14+
env: TOXENV=docs
15+
16+
# Packaging
17+
- python: 3.6
18+
env: TOXENV=packaging
19+
20+
cache:
21+
- pip
22+
- directories:
23+
- ${HOME}/.cache
24+
25+
install:
26+
- python -m pip install -U tox setuptools pip
27+
28+
script:
29+
- tox
30+
31+
notifications:
32+
email: false
33+
34+
branches:
35+
only:
36+
- master

MANIFEST.in

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1+
include *.ini
12
include *.rst
2-
include LICENSE
3-
recursive-include tests *.py
4-
3+
include *.txt
4+
include *.py
5+
include LICENSE
6+
include build_docs.py
7+
include docs/Makefile
8+
include docs/make.bat
9+
recursive-include docs *.rst *.py
10+
recursive-include tests *.py *.conf
11+
recursive-include tests/fixtures *.ova

docs/make.bat

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
@ECHO OFF
2+
3+
pushd %~dp0
4+
5+
REM Command file for Sphinx documentation
6+
7+
if "%SPHINXBUILD%" == "" (
8+
set SPHINXBUILD=sphinx-build
9+
)
10+
set SOURCEDIR=source
11+
set BUILDDIR=build
12+
set SPHINXPROJ=cookiecuttermodule_display_name
13+
14+
if "%1" == "" goto help
15+
16+
%SPHINXBUILD% >NUL 2>NUL
17+
if errorlevel 9009 (
18+
echo.
19+
echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
20+
echo.installed, then set the SPHINXBUILD environment variable to point
21+
echo.to the full path of the 'sphinx-build' executable. Alternatively you
22+
echo.may add the Sphinx directory to PATH.
23+
echo.
24+
echo.If you don't have Sphinx installed, grab it from
25+
echo.http://sphinx-doc.org/
26+
exit /b 1
27+
)
28+
29+
%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
30+
goto end
31+
32+
:help
33+
%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
34+
35+
:end
36+
popd

tox.ini

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = lint, docs
2+
envlist = lint, docs, packaging
33

44
[testenv:lint]
55
commands =
@@ -8,5 +8,11 @@ commands =
88

99
[testenv:docs]
1010
commands =
11-
python -m pip install --upgrade -r dev-requirements.txt
11+
python -m pip install Sphinx
1212
python {toxinidir}/build_docs.py
13+
14+
[testenv:packaging]
15+
commands =
16+
python -m pip install readme_renderer check-manifest
17+
check-manifest --ignore *.yml,.github*
18+
python setup.py check --metadata --restructuredtext --strict

virtualbox/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def import_vboxapi():
5656
'C:\\Python%s%s\\Lib\\site-packages\\win32\\lib' % py_mm_ver,
5757
'C:\\Program Files\\Oracle\\VirtualBox\\sdk\\install',
5858
'C:\\Program Files (x86)\\Oracle\\VirtualBox\\sdk\\install']
59-
59+
6060
for x in ['', py_major]:
6161
search.extend(['C:\\Anaconda%s\\Lib\\site-packages' % x,
6262
'C:\\Anaconda%s\\Lib\\site-packages\win32' % x,

virtualbox/library_base.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ def __repr__(self):
7777

7878
def __eq__(self, k):
7979
return self.__cmp__(k) == 0
80-
80+
8181
def __ne__(self, k):
8282
return self.__cmp__(k) != 0
83-
83+
8484
def __lt__(self, k):
8585
return int(self) < int(k)
86-
86+
8787
def __gt__(self, k):
8888
return int(self) > int(k)
8989

0 commit comments

Comments
 (0)