Skip to content

Commit

Permalink
Moving code from src/ to base and adding dependency checks (#10)
Browse files Browse the repository at this point in the history
* Moving code from src to root.
  • Loading branch information
kiddinn authored and Onager committed Aug 8, 2018
1 parent 5ffd39b commit 5353b84
Show file tree
Hide file tree
Showing 224 changed files with 446 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ install:
- pip install -r requirements.txt
- pip install coverage
script:
- if test ${TARGET} = "linux-python36"; then coverage run --source=plasoscaffolder ./src/run_tests_for_coverage.py test; else ./src/run_tests.py; fi
- if test ${TARGET} = "linux-python36"; then coverage run --source=plasoscaffolder ./run_tests_for_coverage.py test; else ./run_tests.py; fi
after_success:
- if test ${TARGET} = "linux-python36"; then curl -o codecov.sh -s https://codecov.io/bash && /bin/bash ./codecov.sh; fi
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ test_script:
# Note that you must use the environment variable %PYTHON% to refer to
# the interpreter you're using - Appveyor does not do anything special
# to put the Python evrsion you want to use on PATH.
- "%PYTHON%\\python.exe src\\run_tests.py test"
- "%PYTHON%\\python.exe run_tests.py test"

after_test:
# This step builds your wheels.
Expand Down
35 changes: 35 additions & 0 deletions dependencies.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[click]
dpkg_name: python3-click
minimum_version: 6.7
pypi_name: click
version_property: __version__

[setuptools]
dpkg_name: python3-setuptools
minimum_version: 35.0.2
pypi_name: setuptools
version_property: __version__

[jinja2]
dpkg_name: python3-jinja2
minimum_version: 2.9.6
pypi_name: jinja2
version_property: __version__

[colorama]
dpkg_name: python3-colorama
minimum_version: 0.3.7
pypi_name: colorama
version_property: __version__

[yapf]
dpkg_name: python3-yapf
minimum_version: 0.16.1
pypi_name: yapf
version_property: __version__

[pexpect]
dpkg_name: python3-pexpect
minimum_version: 4.2.1
pypi_name: pexpect
version_property: __version__
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions utils/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# -*- coding: utf-8 -*-
25 changes: 25 additions & 0 deletions utils/check_dependencies.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
"""Script to check for the availability and version of dependencies."""

from __future__ import print_function
from __future__ import unicode_literals

import sys

# Change PYTHONPATH to include dependencies.
sys.path.insert(0, '.')

import utils.dependencies # pylint: disable=wrong-import-position


if __name__ == '__main__':
dependency_helper = utils.dependencies.DependencyHelper()

if not dependency_helper.CheckDependencies():
build_instructions_url = (
'https://github.com/log2timeline/plaso/wiki/Users-Guide')

print('See: {0:s} on how to set up plaso scaffolder.'.format(
build_instructions_url))
print('')
Loading

0 comments on commit 5353b84

Please sign in to comment.