Permalink
Browse files

Revert part of 8793dec, fix commands, remove shippable.yml

1 parent ca6eddc commit 65b266e9b3e71542b7720d7a81da07f5b59f82b8 @zachriggle zachriggle committed Sep 20, 2016
Showing with 9 additions and 27 deletions.
  1. +1 −0 .gitignore
  2. +2 −2 .travis.yml
  3. +4 −5 TESTING.md
  4. +1 −2 docs/source/install.rst
  5. +0 −16 shippable.yml
  6. +1 −2 tox.ini
View
@@ -14,3 +14,4 @@ dist
*.egg-info
*.core
.coverage
+.tox
View
@@ -25,8 +25,8 @@ before_install:
- source travis/install.sh
- source travis/ssh_setup.sh
install:
- - pip install -e .
- - pip install -r docs/requirements.txt
+ - pip install --upgrade --editable .
+ - pip install --requirement docs/requirements.txt
before_script:
- PWNLIB_NOTERM=1 python -c 'from pwn import *; print pwnlib.term.term_mode'
- PWNLIB_NOTERM=1 python -c 'from pwn import *; print pwnlib.term.term_mode'
View
@@ -8,11 +8,10 @@ Pwntools makes extensive use of unit tests and integration tests to ensure every
To run the test suite, it is beste to use Ubuntu 12.04 or 14.04, and run the following commands. **Be aware** that this will add a user to the machine, and create a public key for SSH login!
```sh
-bash .travis_install.sh
-bash .travis_ssh_setup.sh
-pip setup.py develop
-cd docs
-PWNLIB_NOTERM=1 make clean doctest
+bash travis/install.sh
+bash travis/ssh_setup.sh
+pip install --upgrade --editable .
+PWNLIB_NOTERM=1 make -C docs doctest
```
## New Tests
@@ -35,7 +35,6 @@ If you are hacking on Pwntools locally, you'll want to do something like this:
.. code-block:: bash
$ git clone https://github.com/Gallopsled/pwntools
- $ cd pwntools
- $ python setup.py develop
+ $ pip install --upgrade --editable ./pwntools
.. _Ubuntu: https://launchpad.net/~pwntools/+archive/ubuntu/binutils
View
@@ -1,16 +0,0 @@
-language: python
-python:
- - "2.7"
-before_install:
- - source .travis_install.sh
- - source .travis_ssh_setup.sh
-install:
- - python setup.py develop
-before_script:
- - PWNLIB_NOTERM=1 python -c 'from pwn import *; print pwnlib.term.term_mode'
- - PWNLIB_NOTERM=1 python -c 'from pwn import *; print pwnlib.term.term_mode'
- - PWNLIB_NOTERM=1 python -c 'from pwn import *; print pwnlib.term.term_mode'
- - PWNLIB_NOTERM=1 python -c 'from pwn import *; print pwnlib.term.term_mode'
-script:
- - PWNLIB_NOTERM=1 make -C docs doctest
-
View
@@ -2,5 +2,4 @@
envlist = py27
[testenv]
deps=-r{toxinidir}/requirements.txt
- -r{toxinidir}/docs/requirements.txt
-commands=make PWNLIB_NOTERM=1 -C docs clean doctest
+commands=make PWNLIB_NOTERM=1 -C docs doctest

0 comments on commit 65b266e

Please sign in to comment.