[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [onionperf/develop] Do some repository housekeeping.
commit 7576ce3ede211722db59bde3ccbc7e79ac4ac60c
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date: Thu Jul 23 20:18:03 2020 +0200
Do some repository housekeeping.
Fixes #40006.
---
.gitignore | 4 ++--
.gitlab-ci.yml | 23 -----------------------
.gitmodules | 0
README.md | 6 ++++++
Vagrantfile | 35 -----------------------------------
debian/changelog | 5 -----
debian/compat | 1 -
debian/control | 40 ----------------------------------------
debian/install | 1 -
debian/rules | 15 ---------------
debian/source/format | 1 -
onionperf/__init__.py | 1 +
onionperf/analysis.py | 1 +
onionperf/measurement.py | 1 +
onionperf/model.py | 1 +
onionperf/monitor.py | 1 +
onionperf/onionperf | 1 +
onionperf/util.py | 1 +
onionperf/visualization.py | 1 +
run_tests.sh | 3 ---
20 files changed, 16 insertions(+), 126 deletions(-)
diff --git a/.gitignore b/.gitignore
index 5e79b0e..e3e7b28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
-/.onionperf/*
onionperf-data
+onionperf-private
venv
*.json.xz
*.pdf
+*.csv
*.pyc
-onionperf/docs/_build
.coverage
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index aed7769..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-variables:
- GIT_STRATEGY: clone
-
-stages:
- - test
-
-test:
- stage: test
- image: debian:buster
- coverage: '/TOTAL.+ ([0-9]{1,3}%)/'
- script:
- - apt -y update
- - apt -y install git cmake make build-essential gcc libigraph0-dev libglib2.0-dev python-dev libxml2-dev python-lxml python-networkx python-scipy python-matplotlib python-numpy libevent-dev libssl-dev python-stem tor python-nose python-cov-core
- - git clone https://github.com/shadow/tgen.git
- - mkdir -p tgen/build
- - pushd tgen/build
- - cmake ..
- - make
- - ln -s `pwd`/tgen /usr/bin/
- - popd
- - python setup.py build
- - python setup.py install
- - ./run_tests.sh
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e69de29..0000000
diff --git a/README.md b/README.md
index b9bf7e6..ad53a9e 100644
--- a/README.md
+++ b/README.md
@@ -125,6 +125,12 @@ deactivate
However, in order to perform measurements or analyses, the virtual environment needs to be activated first. This will ensure all the paths are found.
+If needed, unit tests are run with the following command:
+
+```shell
+cd ~/onionperf/
+python3 -m nose --with-coverage --cover-package=onionperf
+```
## Measurement
diff --git a/Vagrantfile b/Vagrantfile
deleted file mode 100644
index 1fdd10f..0000000
--- a/Vagrantfile
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-$setup_onionperf = <<SCRIPT
-export DEBIAN_FRONTEND=noninteractive
-apt-get update
-apt install -y build-essential autoconf cmake libglib2.0-dev libigraph0-dev libevent-dev libssl-dev python3 git python3-stem python3-lxml python3-networkx python3-matplotlib python3-numpy python3-scipy
-cd ~
-git clone https://git.torproject.org/tor.git
-cd tor
-./autogen.sh
-./configure --disable-asciidoc
-make
-mv src/app/tor /usr/local/bin/
-cd ~
-git clone https://github.com/shadow/shadow.git
-cd shadow/src/plugin/shadow-plugin-tgen
-mkdir build
-cd build
-cmake .. -DSKIP_SHADOW=ON -DCMAKE_MODULE_PATH=`pwd`/../../../../cmake/
-make
-mv tgen /usr/local/bin/
-cd /vagrant
-python3 setup.py build
-python3 setup.py install
-SCRIPT
-
-Vagrant.configure("2") do |config|
- config.vm.box = "debian/stretch64"
-
- config.vm.define "oniondev" do |oniondev|
- oniondev.vm.provision :shell, :inline => $setup_onionperf
- end
-
-end
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index 7671854..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-onionperf (2019052301) stretch-backports; urgency=medium
-
- * Initial release.
-
- -- Iain R. Learmonth <irl@xxxxxxxxxx> Thu, 23 May 2019 12:42:20 +0100
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
deleted file mode 100644
index c8ffa68..0000000
--- a/debian/control
+++ /dev/null
@@ -1,40 +0,0 @@
-Source: onionperf
-Maintainer: Tor Metrics <metrics-team@xxxxxxxxxxxxxxxxxxxx>
-Section: net
-Priority: optional
-Build-Depends: debhelper (>= 11),
- dh-python,
- cmake,
- make,
- build-essential,
- gcc,
- libigraph0-dev,
- libglib2.0-dev,
- python,
- python-ipaddress,
- python-lxml,
- python-matplotlib,
- python-netifaces,
- python-networkx,
- python-nose,
- python-numpy,
- python-scipy,
- python-stem (>=1.7)
-Standards-Version: 4.1.3
-
-Package: onionperf
-Architecture: any
-Depends: ${python:Depends},
- ${shlibs:Depends},
- ${misc:Depends},
- python-ipaddress,
- python-lxml,
- python-matplotlib,
- python-netifaces,
- python-networkx,
- python-nose,
- python-numpy,
- python-scipy,
- python-stem (>=1.7)
-Description: Tor Performance Measurement Tool
- Tor Performance Measurement Tool
diff --git a/debian/install b/debian/install
deleted file mode 100644
index 6d40677..0000000
--- a/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-tgen/build/tgen usr/bin
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 64d85ba..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/make -f
-
-%:
- dh $@ --with python2 --buildsystem=pybuild
-
-override_dh_auto_test:
- ./run_tests.sh
-
-override_dh_auto_build:
- ( cd tgen; \
- mkdir build; \
- cd build; \
- cmake ..; \
- make )
- dh_auto_build
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 89ae9db..0000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (native)
diff --git a/onionperf/__init__.py b/onionperf/__init__.py
index 79e37c3..f323b49 100644
--- a/onionperf/__init__.py
+++ b/onionperf/__init__.py
@@ -1,6 +1,7 @@
'''
OnionPerf
Authored by Rob Jansen, 2015
+ Copyright 2015-2020 The Tor Project
See LICENSE for licensing information
'''
diff --git a/onionperf/analysis.py b/onionperf/analysis.py
index e269f6a..6325764 100644
--- a/onionperf/analysis.py
+++ b/onionperf/analysis.py
@@ -1,6 +1,7 @@
'''
OnionPerf
Authored by Rob Jansen, 2015
+ Copyright 2015-2020 The Tor Project
See LICENSE for licensing information
'''
diff --git a/onionperf/measurement.py b/onionperf/measurement.py
index 823f37a..af1fa0d 100644
--- a/onionperf/measurement.py
+++ b/onionperf/measurement.py
@@ -1,6 +1,7 @@
'''
OnionPerf
Authored by Rob Jansen, 2015
+ Copyright 2015-2020 The Tor Project
See LICENSE for licensing information
'''
diff --git a/onionperf/model.py b/onionperf/model.py
index f06f8e0..cb45f51 100644
--- a/onionperf/model.py
+++ b/onionperf/model.py
@@ -1,6 +1,7 @@
'''
OnionPerf
Authored by Rob Jansen, 2015
+ Copyright 2015-2020 The Tor Project
See LICENSE for licensing information
'''
diff --git a/onionperf/monitor.py b/onionperf/monitor.py
index 5387bff..9bf9691 100644
--- a/onionperf/monitor.py
+++ b/onionperf/monitor.py
@@ -1,6 +1,7 @@
'''
OnionPerf
Authored by Rob Jansen, 2015
+ Copyright 2015-2020 The Tor Project
See LICENSE for licensing information
'''
diff --git a/onionperf/onionperf b/onionperf/onionperf
index 36520ad..e8024ce 100755
--- a/onionperf/onionperf
+++ b/onionperf/onionperf
@@ -3,6 +3,7 @@
'''
OnionPerf
Authored by Rob Jansen, 2015
+ Copyright 2015-2020 The Tor Project
See LICENSE for licensing information
'''
diff --git a/onionperf/util.py b/onionperf/util.py
index cb9f065..4eee911 100644
--- a/onionperf/util.py
+++ b/onionperf/util.py
@@ -1,6 +1,7 @@
'''
OnionPerf
Authored by Rob Jansen, 2015
+ Copyright 2015-2020 The Tor Project
See LICENSE for licensing information
'''
diff --git a/onionperf/visualization.py b/onionperf/visualization.py
index 80c0781..f88c984 100644
--- a/onionperf/visualization.py
+++ b/onionperf/visualization.py
@@ -1,6 +1,7 @@
'''
OnionPerf
Authored by Rob Jansen, 2015
+ Copyright 2015-2020 The Tor Project
See LICENSE for licensing information
'''
diff --git a/run_tests.sh b/run_tests.sh
deleted file mode 100755
index 7a30e61..0000000
--- a/run_tests.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-PYTHONPATH=. python3 -m nose --with-coverage --cover-package=onionperf
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits