Skip to content

Commit 81f088b

Browse files
alimezaarontp
andauthored
Tox setup (google#597)
* change? * resolved conflicts * Added tox test for documents validity. * Back to weird newline error... * this takes care of untouched files * Changed travis config * Changed travis configs2 * fixed the tox issue * Added tox to requirements * Removed tox from requirements * changed the tox config * removed python from tox * Update install.md Co-authored-by: Aaron Peterson <[email protected]>
1 parent 8e462f0 commit 81f088b

File tree

5 files changed

+18
-3
lines changed

5 files changed

+18
-3
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
/build/
1212
*/_build/
1313
/_sources/
14+
/.tox
1415

1516
# And don't care about the 'egg'.
1617
/turbinia.egg-info

.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ cache:
66

77
install:
88
- pip install mock nose coverage yapf
9+
- pip install tox
910
- pip install .
1011
- pip install .[local]
1112

1213
script:
1314
- ./run_tests.py
15+
- tox --sitepackages ${TOXENV}

docs/developer/contributing.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ To update your local repo from the main:
3737

3838
Please follow the Style Guide when making your changes, and also make sure to
3939
use the project's
40-
[pylintrc](https://github.com/google/turbinia/blob/master/turbinia/config/pylintrc)
40+
[pylintrc](https://github.com/google/turbinia/blob/master/.pylintrc)
4141
and
42-
[yapf config file](https://github.com/google/turbinia/blob/master/turbinia/config/style.yapf).
42+
[yapf config file](https://github.com/google/turbinia/blob/master/.style.yapf).
4343
Once you're ready for review make sure the tests pass:
4444

4545
$ pip install -e .[dev]

docs/user/install.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ documentation for more details on what the architecture looks like for each of
99
these installation types. This doc covers the recommended quick installation
1010
instructions for Cloud installations. This uses
1111
[terraform configs](https://github.com/forseti-security/osdfir-infrastructure)
12+
that are part of the
13+
[Forseti Security repository](https://github.com/forseti-security)
1214
to automate deployment of Turbinia into an existing GCP Project. If you want to
1315
install Turbinia in hybrid or local only mode, or want to install Turbinia
1416
manually (not recommended), see
@@ -67,7 +69,7 @@ to get a shell with access to your GCP resources.
6769
create a [Timesketch](http://timesketch.org) instance in the same
6870
project, and this can be configured to ingest Turbinia timeline
6971
output and report data. See the
70-
[Documentation on this](https://github.com/forseti-security/osdfir-infrastructure/blob/master/README.md)
72+
[Documentation on this](https://github.com/forseti-security/osdfir-infrastructure)
7173
for more details.
7274
* When prompted for the project name, enter the project you selected
7375
during setup.

tox.ini

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[tox]
2+
envlist = docs
3+
4+
[testenv:docs]
5+
usedevelop = true
6+
deps =
7+
-rdocs/requirements.txt
8+
commands =
9+
sphinx-build -b html -d build/doctrees docs dist/docs
10+
sphinx-build -b linkcheck docs dist/docs

0 commit comments

Comments
 (0)