Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
base repository: NullHypothesis/onionperf
base: master
head repository: NullHypothesis/onionperf
compare: defect/30586
Checking mergeability… Don’t worry, you can still create the pull request.
  • 5 commits
  • 3 files changed
  • 0 comments
  • 1 contributor
Commits on May 15, 2020
@NullHypothesis
Update requirements.txt to actual requirements.
aebf690 
As pointed out in #30586, requirements.txt is not in sync with what
onionperf actually requires.  This commit adds missing and removes
unnecessary dependencies.
Commits on May 18, 2020
@NullHypothesis
Add install_requires to setup.py.
d4acc35 
To make this work, we also had to replace distutils with setuptools
because distutils does not understand the install_requires keyword.
@NullHypothesis
Add command that updates pip to latest version.
b138baa 
If we don't do that, pip may fail because older versions don't ship with
the wheel package, which is needed to build some of our requirements.
@NullHypothesis
Update instructions so they don't require root.
bbfcf6c
Commits on May 22, 2020
@NullHypothesis
Add pandas and seaborn to requirements.txt.
c3f97c2 
Now that <https://bugs.torproject.org/33258> is merged, we require these
two libraries.
Showing with 17 additions and 13 deletions.
  1. +8 −4 README.md
  2. +4 −8 requirements.txt
  3. +5 −1 setup.py
12 README.md
View file
@@ -20,7 +20,7 @@ For a dockerized setup, see https://github.com/hiromipaw/onionperf-docker
These are the quick deployment instructions for the current Debian stable distribution.

```
sudo apt install git cmake make build-essential gcc libigraph0-dev libglib2.0-dev python3-dev libxml2-dev python3-lxml python3-networkx python3-scipy python3-matplotlib python3-numpy libevent-dev libssl-dev python3-stem tor
sudo apt install git cmake make build-essential gcc libigraph0-dev libglib2.0-dev python3-dev libxml2-dev python3-lxml python3-networkx python3-scipy python3-matplotlib python3-numpy libevent-dev libssl-dev python3-stem python3-pandas python3-seaborn tor
git clone https://github.com/shadow/tgen.git
cd tgen
@@ -32,10 +32,13 @@ sudo ln -s ~/tgen/build/tgen /usr/bin/tgen
git clone https://github.com/torproject/onionperf
cd onionperf
sudo python3 setup.py build
sudo python3 setup.py install
python3 setup.py build
python3 setup.py install --user
```

Once the installation finished, you can find the onionperf script in
`~/.local/bin/`.

## Step-by-step installation instructions

Here you can find more detailed instructions for the current Debian stable distribution.
@@ -69,7 +72,7 @@ sudo apt install cmake make build-essential gcc libigraph0-dev libglib2.0-dev py
The easiest way to satisfy all system dependencies is to use a package manager.

```
apt install tor libxml2-dev python3-lxml python3-networkx python3-scipy python3-matplotlib python3-numpy python3-stem
apt install tor libxml2-dev python3-lxml python3-networkx python3-scipy python3-matplotlib python3-numpy python3-stem python3-pandas python3-seaborn
```

@@ -96,6 +99,7 @@ to avoid conflicts with your other python projects.
```
python3 -m venv venv
source venv/bin/activate
pip install --upgrade pip # make sure that you have a recent version of pip
pip install -r requirements.txt # installs all required python modules for all OnionPerf subcommands
deactivate
```
12 requirements.txt
View file
@@ -1,14 +1,10 @@
Twisted
cycler
decorator
lxml
matplotlib
networkx
nose-cov
nose
numpy
pyparsing
python-dateutil
pytz
pandas
scipy
six
seaborn
stem
zope.interface
6 setup.py
View file
@@ -1,6 +1,9 @@
#!/usr/bin/env python3

from distutils.core import setup
from setuptools import setup

with open('requirements.txt') as f:
install_requires = f.readlines()

setup(name='OnionPerf',
version='0.2.pre',
@@ -9,4 +12,5 @@
url='https://github.com/robgjansen/onionperf/',
packages=['onionperf'],
scripts=['onionperf/onionperf'],
install_requires=install_requires
)

No commit comments for this range