Skip to content

Commit

Permalink
Code review: 241810043: Initial Travis Mac OS X support log2timeline#18
Browse files Browse the repository at this point in the history
  • Loading branch information
joachimmetz committed Aug 1, 2016
1 parent aa9dea7 commit 7721421
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 11 deletions.
19 changes: 13 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
sudo: required
dist: trusty
language: python
python:
- "2.7"
- "3.4"
matrix:
include:
- os: linux
dist: trusty
sudo: required
python: 2.7
- os: linux
dist: trusty
sudo: required
python: 3.4
- os: osx
language: generic
before_install:
- ./config/travis/before_install.sh
script:
- if test `uname -s` = 'Linux' && test ${TRAVIS_PYTHON_VERSION} = "2.7"; then coverage run --source=dfvfs --omit="*_test*,*__init__*,*test_lib*" ./run_tests.py; else ./run_tests.py; fi
- python setup.py build
- python setup.py sdist
- python setup.py bdist
- mkdir -p ${PWD}/tmp/lib/python${TRAVIS_PYTHON_VERSION}/site-packages/ && PYTHONPATH=${PWD}/tmp/lib/python${TRAVIS_PYTHON_VERSION}/site-packages/ python setup.py install --prefix=${PWD}/tmp/
- if test `uname -s` = 'Linux'; then mkdir -p ${PWD}/tmp/lib/python${TRAVIS_PYTHON_VERSION}/site-packages/ && PYTHONPATH=${PWD}/tmp/lib/python${TRAVIS_PYTHON_VERSION}/site-packages/ python setup.py install --prefix=${PWD}/tmp/; fi
after_success:
- if test `uname -s` = 'Linux' && test ${TRAVIS_PYTHON_VERSION} = "2.7"; then coveralls --verbose; fi
4 changes: 2 additions & 2 deletions config/dpkg/changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dfvfs (20160726-1) unstable; urgency=low
dfvfs (20160801-1) unstable; urgency=low

* Auto-generated

-- Log2Timeline <[email protected]> Tue, 26 Jul 2016 06:37:47 +0200
-- Log2Timeline <[email protected]> Mon, 01 Aug 2016 11:08:34 +0200
11 changes: 10 additions & 1 deletion config/travis/before_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,16 @@ PYTHON3_DEPENDENCIES="libbde-python3 libewf-python3 libfsntfs-python3 libfwnt-py
# Exit on error.
set -e;

if test `uname -s` = "Linux";
if test `uname -s` = "Darwin";
then
git clone https://github.com/log2timeline/l2tdevtools.git;

mv l2tdevtools ../;
mkdir dependencies;

PYTHONPATH=../l2tdevtools ../l2tdevtools/tools/update.py --download-directory=dependencies --preset=dfvfs;

elif test `uname -s` = "Linux";
then
sudo add-apt-repository ppa:gift/dev -y;
sudo apt-get update -q;
Expand Down
2 changes: 1 addition & 1 deletion dfvfs/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
storage media types and file formats.
"""

__version__ = '20160726'
__version__ = '20160801'
12 changes: 11 additions & 1 deletion utils/update_dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,17 @@ class TravisBeforeInstallScript(object):
u'# Exit on error.',
u'set -e;',
u'',
u'if test `uname -s` = "Linux";',
u'if test `uname -s` = "Darwin";',
u'then',
u'\tgit clone https://github.com/log2timeline/l2tdevtools.git;',
u'',
u'\tmv l2tdevtools ../;',
u'\tmkdir dependencies;',
u'',
(u'\tPYTHONPATH=../l2tdevtools ../l2tdevtools/tools/update.py '
u'--download-directory=dependencies --preset=dfvfs;'),
u'',
u'elif test `uname -s` = "Linux";',
u'then',
u'\tsudo add-apt-repository ppa:gift/dev -y;',
u'\tsudo apt-get update -q;',
Expand Down

0 comments on commit 7721421

Please sign in to comment.