Permalink
Browse files

Updated dependencies with l2tdevtools

  • Loading branch information...
joachimmetz committed Jan 15, 2018
1 parent 56f1d90 commit ec0b1579cc4f3cf780902f707f4b94712af7daa9
Showing with 172 additions and 179 deletions.
  1. +6 −1 .travis.yml
  2. +10 −12 appveyor.yml
  3. +8 −0 artifacts.ini
  4. +4 −4 config/dpkg/control
  5. +5 −3 config/travis/install.sh
  6. +1 −3 requirements.txt
  7. +1 −1 setup.cfg
  8. +2 −1 tox.ini
  9. +135 −154 utils/dependencies.py
View
@@ -4,14 +4,19 @@ matrix:
- os: linux
dist: trusty
sudo: required
group: edge
python: 2.7
env: TOXENV=py27
- os: linux
dist: trusty
sudo: required
group: edge
python: 3.4
env: TOXENV=py34
- os: osx
osx_image: xcode8.1
osx_image: xcode8.3
language: generic
env: PYTHONPATH=/Library/Python/2.7/site-packages/
install:
- ./config/travis/install.sh
script:
View
@@ -1,20 +1,18 @@
environment:
matrix:
- PYTHON: "C:\\Python27"
- TARGET: python27
PYTHON: "C:\\Python27"
- TARGET: python36
PYTHON: "C:\\Python36"
install:
- cmd: '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86 /release'
- ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
- ps: (new-object net.webclient).DownloadFile('https://bootstrap.pypa.io/get-pip.py', 'C:\Projects\get-pip.py')
- ps: (new-object net.webclient).DownloadFile('https://github.com/log2timeline/l2tbinaries/raw/master/win32/pywin32-220.win32-py2.7.exe', 'C:\Projects\pywin32-220.win32-py2.7.exe')
- ps: (new-object net.webclient).DownloadFile('https://github.com/log2timeline/l2tbinaries/raw/master/win32/WMI-1.4.9.win32.exe', 'C:\Projects\WMI-1.4.9.win32.exe')
- cmd: "%PYTHON%\\python.exe C:\\Projects\\get-pip.py"
- cmd: "%PYTHON%\\Scripts\\easy_install.exe C:\\Projects\\pywin32-220.win32-py2.7.exe"
- cmd: "%PYTHON%\\Scripts\\easy_install.exe C:\\Projects\\WMI-1.4.9.win32.exe"
- cmd: git clone https://github.com/log2timeline/l2tdevtools.git && move l2tdevtools ..\
- cmd: mkdir dependencies && set PYTHONPATH=..\l2tdevtools && "%PYTHON%\\python.exe" ..\l2tdevtools\tools\update.py --download-directory dependencies --machine-type x86 --msi-targetdir "%PYTHON%" --track dev PyYAML yapf
- cmd: '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86 /release'
- cmd: "%PYTHON%\\Scripts\\pip.exe install --upgrade pip"
- cmd: "%PYTHON%\\Scripts\\pip.exe install pypiwin32 WMI"
- cmd: git clone https://github.com/log2timeline/l2tdevtools.git ..\l2tdevtools
- cmd: mkdir dependencies && set PYTHONPATH=..\l2tdevtools && "%PYTHON%\\python.exe" ..\l2tdevtools\tools\update.py --download-directory dependencies --machine-type x86 --msi-targetdir "%PYTHON%" --track dev PyYAML funcsigs mock pbr six yapf
build: off
test_script:
- "%PYTHON%\\python.exe run_tests.py"
- "%PYTHON%\\python.exe run_tests.py"
View
@@ -0,0 +1,8 @@
[project]
name: artifacts
name_description: ForensicArtifacts.com Artifact Repository
maintainer: Forensic artifacts <forensicartifacts@googlegroups.com>
homepage_url: https://github.com/ForensicArtifacts/artifacts
description_short: ForensicArtifacts.com Artifact Repository.
description_long: A free, community-sourced, machine-readable knowledge base of forensic
artifacts that the world can use both as an information source and within other tools.
View
@@ -2,7 +2,7 @@ Source: artifacts
Section: python
Priority: extra
Maintainer: Forensic artifacts <forensicartifacts@googlegroups.com>
Build-Depends: debhelper (>= 7), python-all (>= 2.7~), python-setuptools, python3-all (>= 3.4~), python3-setuptools
Build-Depends: debhelper (>= 9), python-all (>= 2.7~), python-setuptools, python3-all (>= 3.4~), python3-setuptools
Standards-Version: 3.9.5
X-Python-Version: >= 2.7
X-Python3-Version: >= 3.4
@@ -18,20 +18,20 @@ Description: Data files for ForensicArtifacts.com Artifact Repository
Package: python-artifacts
Architecture: all
Depends: artifacts-data, python-yaml (>= 3.10), ${python:Depends}, ${misc:Depends}
Description: Python bindings for ForensicArtifacts.com Artifact Repository
Description: Python 2 module of ForensicArtifacts.com Artifact Repository
A free, community-sourced, machine-readable knowledge base of forensic
artifacts that the world can use both as an information source and within other tools.
Package: python3-artifacts
Architecture: all
Depends: artifacts-data, python3-yaml (>= 3.10), ${python3:Depends}, ${misc:Depends}
Description: Python bindings for ForensicArtifacts.com Artifact Repository
Description: Python 3 module of ForensicArtifacts.com Artifact Repository
A free, community-sourced, machine-readable knowledge base of forensic
artifacts that the world can use both as an information source and within other tools.
Package: artifacts-tools
Architecture: all
Depends: python-artifacts, python (>= 2.7~), ${python:Depends}, ${misc:Depends}
Description: Tools for ForensicArtifacts.com Artifact Repository
Description: Tools of ForensicArtifacts.com Artifact Repository
A free, community-sourced, machine-readable knowledge base of forensic
artifacts that the world can use both as an information source and within other tools.
View
@@ -6,11 +6,11 @@ COVERALL_DEPENDENCIES="python-coverage python-coveralls python-docopt";
L2TBINARIES_DEPENDENCIES="PyYAML";
L2TBINARIES_TEST_DEPENDENCIES="yapf";
L2TBINARIES_TEST_DEPENDENCIES="funcsigs mock pbr six yapf";
PYTHON2_DEPENDENCIES="python-yaml";
PYTHON2_TEST_DEPENDENCIES="python-yapf";
PYTHON2_TEST_DEPENDENCIES="python-mock python-tox python-yapf";
# Exit on error.
set -e;
@@ -22,10 +22,12 @@ then
mv l2tdevtools ../;
mkdir dependencies;
PYTHONPATH=../l2tdevtools ../l2tdevtools/tools/update.py --download-directory=dependencies ${L2TBINARIES_DEPENDENCIES} ${L2TBINARIES_TEST_DEPENDENCIES};
PYTHONPATH=../l2tdevtools ../l2tdevtools/tools/update.py --download-directory dependencies --track dev ${L2TBINARIES_DEPENDENCIES} ${L2TBINARIES_TEST_DEPENDENCIES};
elif test ${TRAVIS_OS_NAME} = "linux";
then
sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list;
sudo add-apt-repository ppa:gift/dev -y;
sudo apt-get update -q;
# Only install the Python 2 dependencies.
View
@@ -1,4 +1,2 @@
pip >= 7.0.0
pytest
yapf
PyYAML >= 3.10
PyYAML >= 3.10
View
@@ -6,4 +6,4 @@ doc_files = ACKNOWLEDGEMENTS
LICENSE
README
build_requires = python-setuptools
requires = PyYAML >= 3.10
requires = PyYAML >= 3.10
View
@@ -1,8 +1,9 @@
[tox]
envlist = py27, py34
envlist = py2, py3
[testenv]
commands = nosetests -v
deps =
nose
yapf
-rrequirements.txt
Oops, something went wrong.

0 comments on commit ec0b157

Please sign in to comment.