Skip to content

Commit d2c6857

Browse files
piax93piax93
committed
added long description, updated pre-commit hooks, moved from testify to pytest, bumping version
1 parent 5693332 commit d2c6857

19 files changed

+319
-244
lines changed

‎.activate.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
virtualenv_run/bin/activate

‎.coveragerc

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
[run]
2+
branch = True
3+
source =
4+
.
5+
omit =
6+
.tox/*
7+
virtualenv_run/*
8+
setup.py
9+
10+
[report]
11+
show_missing = True
12+
skip_covered = True
13+
14+
exclude_lines =
15+
# Have to re-enable the standard pragma
16+
\#\s*pragma: no cover
17+
18+
# Don't complain if tests don't hit defensive assertion code:
19+
^\s*raise AssertionError\b
20+
^\s*raise NotImplementedError\b
21+
^\s*return NotImplemented\b
22+
^\s*raise$
23+
24+
# Don't complain if non-runnable code isn't run:
25+
^if __name__ == ['"]__main__['"]:$
26+
27+
[html]
28+
directory = coverage-html
29+
30+
# vim:ft=dosini

‎.deactivate.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
deactivate

‎.pre-commit-config.yaml

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,35 @@
1+
exclude: '^tests/output_filters/data/.*$'
2+
repos:
13
- repo: git://github.com/pre-commit/pre-commit-hooks
2-
sha: 493665a5fc24deb2204fc48b8398be77e6c9e5d5
4+
rev: v2.1.0
35
hooks:
4-
- id: check-added-large-files
5-
- id: check-merge-conflict
6-
- id: trailing-whitespace
7-
- id: end-of-file-fixer
8-
- id: autopep8-wrapper
9-
args:
10-
- -i
11-
- --ignore=E501
12-
- id: check-case-conflict
136
- id: check-json
14-
- id: check-xml
157
- id: check-yaml
16-
- id: flake8
8+
- id: end-of-file-fixer
9+
- id: trailing-whitespace
1710
- id: name-tests-test
1811
- id: requirements-txt-fixer
19-
- repo: [email protected]:yelp_pre_commit_hooks
20-
sha: 3cb9f5b565bacf06990d83c832cb452d099287f4
21-
hooks:
22-
- id: httplib-https-connection
23-
- id: use-except-as
24-
- id: check-indentation
25-
- id: check-imports
26-
- id: check_mock_methods
12+
- id: double-quote-string-fixer
13+
- id: flake8
2714
- id: fix-encoding-pragma
15+
- repo: git://github.com/pre-commit/mirrors-autopep8
16+
rev: v1.4.3
17+
hooks:
18+
- id: autopep8
2819
- repo: git://github.com/asottile/reorder_python_imports
29-
sha: b022734351abe44d0b05a71a4fa1175287c59b49
20+
rev: v1.4.0
3021
hooks:
3122
- id: reorder-python-imports
23+
args: [
24+
'--add-import', 'from __future__ import absolute_import',
25+
]
26+
exclude: setup.py
27+
- repo: git://github.com/asottile/add-trailing-comma
28+
rev: v1.0.0
29+
hooks:
30+
- id: add-trailing-comma
3231
- repo: https://github.com/Yelp/detect-secrets
33-
sha: 0.9.1
32+
rev: v0.12.2
3433
hooks:
3534
- id: detect-secrets
3635
args: ['--baseline', '.secrets.baseline']

‎.secrets.baseline

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
11
{
2-
"exclude_regex": ".*tests/.*|\\.pre-commit-config\\.yaml",
3-
"generated_at": "2018-12-11T20:35:18Z",
2+
"exclude": {
3+
"files": ".*tests/.*|\\\\.pre-commit-config\\\\.yaml",
4+
"lines": null
5+
},
6+
"generated_at": "2019-04-05T13:55:48Z",
47
"plugins_used": [
58
{
6-
"base64_limit": 4.5,
9+
"base64_limit": 4.5,
710
"name": "Base64HighEntropyString"
8-
},
11+
},
912
{
10-
"hex_limit": 3,
13+
"hex_limit": 3,
1114
"name": "HexHighEntropyString"
12-
},
15+
},
1316
{
1417
"name": "PrivateKeyDetector"
1518
}
16-
],
19+
],
1720
"results": {
1821
".travis.yml": [
1922
{
20-
"hashed_secret": "36c40ddcd0af7727303e64726cb8e775fecab969",
21-
"line_number": 11,
23+
"hashed_secret": "a758eff5d472614adab86f9bac8e84fc6be0d25e",
24+
"line_number": 13,
2225
"type": "Base64 High Entropy String"
2326
}
2427
]
25-
},
26-
"version": "0.9.1"
28+
},
29+
"version": "0.12.2"
2730
}

‎.travis.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
language: generic
22
os: osx
3-
osx_image: xcode9.3
4-
install:
5-
- pip2 install --user -r requirements-dev.txt
6-
script: make test
3+
osx_image: xcode9.4
4+
5+
install: sudo pip install tox
6+
7+
script: tox -epy27
78
deploy:
89
provider: pypi
910
user: yelplabs
11+
distributions: sdist bdist_wheel
1012
password:
11-
secure: kzFpHUdNR8/5Mb8j0WE7MoGjnrsdY+OaD/WJYLJR0t8m0bbI23iKvWoti5BaWc0xbwjyck+DMIRkgaLrFjqTg/Cv0vgRw4hexIPw70tbQ67R8iJ1H2uIFiFeLZHLthedMkJ28eVDQCWuL51aFGbXxphtbPvPmir+lFWDMkdRC/Y=
13+
secure: I0m1KUbsEBmPtQ/CQGmPDHr8FUx96IU9s6IM/HqmF/lRTvIp/uPAVxRSNjxvOvVecCLRBDP6H60wSTIb1wVXME7Zg1PHhioOUb1gzWJ7Atq4QTdf5+qJfdZs+fvOoKuWYukj2pWpY5HypIq9crM7L5VzeOYAuYwnK65tJK9yvfo=
1214
on:
1315
tags: true
14-
distributions: sdist bdist_wheel
1516
repo: Yelp/osxcollector
16-
branch: pypi-autodeploy
17+
branch: master

‎Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,15 @@ all:
66
test:
77
tox
88

9+
install-hooks:
10+
pre-commit install -f --install-hooks
11+
912
venv:
1013
tox -evenv
1114

1215
clean:
1316
rm -rf build/ dist/ osxcollector.egg-info/ .tox/ virtualenv_run/
1417
find . -name '*.pyc' -delete
15-
find . -name '__pycache__' -delete
18+
find . -name '__pycache__' -delete
1619

17-
.PHONY: all test venv clean
20+
.PHONY: all test venv clean install-hooks

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
![osxcollector](osx-github.png)
1+
![osxcollector](https://raw.githubusercontent.com/Yelp/osxcollector/master/osx-github.png)
22

33
[![Stories in Ready](https://badge.waffle.io/Yelp/osxcollector.png?label=ready&title=Ready)](https://waffle.io/Yelp/osxcollector)
44
[![Stories in In Progress](https://badge.waffle.io/Yelp/osxcollector.png?label=in%20progress&title=In%20Progress)](https://waffle.io/Yelp/osxcollector)
55
[![Build Status](https://travis-ci.org/Yelp/osxcollector.svg)](https://travis-ci.org/Yelp/osxcollector)
6+
[![PyPI](https://img.shields.io/pypi/v/osxcollector.svg)](https://pypi.python.org/pypi/osxcollector)
67

78
# OSXCollector Manual
89
OSXCollector is a forensic evidence collection & analysis toolkit for OSX.

‎osxcollector/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
# -*- coding: utf-8 -*-
2+
from __future__ import absolute_import
3+
__version__ = '1.11'

0 commit comments

Comments
 (0)