[tor-commits] [oonib/master] Set date in ChangeLog
art at torproject.org
art at torproject.org
Mon May 9 17:57:03 UTC 2016
commit 3af8ff3b8f387edf88d7d4a8e877b7cfbe63418a
Author: Arturo Filastò <arturo at filasto.net>
Date: Wed Apr 27 13:15:04 2016 +0200
Set date in ChangeLog
* Clean up requirements.txt
* Clean up Vagrantfile
---
ChangeLog.rst | 2 +-
Vagrantfile | 103 -------------------------------------------------------
requirements.txt | 24 +++----------
3 files changed, 5 insertions(+), 124 deletions(-)
diff --git a/ChangeLog.rst b/ChangeLog.rst
index b318708..c34857c 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,7 +1,7 @@
ChangeLog
=========
-1.2.0 (XXX, XXX Apr 2016)
+1.2.0 (Wed, 27 Apr 2016)
-------------------------
* Add support for receiving JSON based reports
diff --git a/Vagrantfile b/Vagrantfile
index b2c97b0..b71e4e7 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,112 +2,9 @@
# vi: set ft=ruby :
Vagrant.configure("2") do |config|
- # All Vagrant configuration is done here. The most common configuration
- # options are documented and commented below. For a complete reference,
- # please see the online documentation at vagrantup.com.
-
- # Every Vagrant virtual environment requires a box to build off of.
config.vm.box = "precise32"
-
- # The url from where the 'config.vm.box' box will be fetched if it
- # doesn't already exist on the user's system.
config.vm.box_url = "http://files.vagrantup.com/precise32.box"
-
- # Create a forwarded port mapping which allows access to a specific port
- # within the machine from a port on the host machine. In the example below,
- # accessing "localhost:8080" will access port 80 on the guest machine.
- # config.vm.network :forwarded_port, guest: 80, host: 8080
-
- # Create a private network, which allows host-only access to the machine
- # using a specific IP.
- # config.vm.network :private_network, ip: "192.168.33.10"
-
- # Create a public network, which generally matched to bridged network.
- # Bridged networks make the machine appear as another physical device on
- # your network.
- # config.vm.network :public_network
-
- # Share an additional folder to the guest VM. The first argument is
- # the path on the host to the actual folder. The second argument is
- # the path on the guest to mount the folder. And the optional third
- # argument is a set of non-required options.
config.vm.synced_folder ".", "/data/oonib"
-
- # Provider-specific configuration so you can fine-tune various
- # backing providers for Vagrant. These expose provider-specific options.
- # Example for VirtualBox:
- #
- # config.vm.provider :virtualbox do |vb|
- # # Don't boot with headless mode
- # vb.gui = true
- #
- # # Use VBoxManage to customize the VM. For example to change memory:
- # vb.customize ["modifyvm", :id, "--memory", "1024"]
- # end
- #
- # View the documentation for the provider you're using for more
- # information on available options.
-
- # Enable provisioning with Puppet stand alone. Puppet manifests
- # are contained in a directory path relative to this Vagrantfile.
- # You will need to create the manifests directory and a manifest in
- # the file precise32.pp in the manifests_path directory.
- #
- # An example Puppet manifest to provision the message of the day:
- #
- # # group { "puppet":
- # # ensure => "present",
- # # }
- # #
- # # File { owner => 0, group => 0, mode => 0644 }
- # #
- # # file { '/etc/motd':
- # # content => "Welcome to your Vagrant-built virtual machine!
- # # Managed by Puppet.\n"
- # # }
- #
- # config.vm.provision :puppet do |puppet|
- # puppet.manifests_path = "manifests"
- # puppet.manifest_file = "init.pp"
- # end
-
- # Enable provisioning with chef solo, specifying a cookbooks path, roles
- # path, and data_bags path (all relative to this Vagrantfile), and adding
- # some recipes and/or roles.
- #
- # config.vm.provision :chef_solo do |chef|
- # chef.cookbooks_path = "../my-recipes/cookbooks"
- # chef.roles_path = "../my-recipes/roles"
- # chef.data_bags_path = "../my-recipes/data_bags"
- # chef.add_recipe "mysql"
- # chef.add_role "web"
- #
- # # You may also specify custom JSON attributes:
- # chef.json = { :mysql_password => "foo" }
- # end
-
- # Enable provisioning with chef server, specifying the chef server URL,
- # and the path to the validation key (relative to this Vagrantfile).
- #
- # The Opscode Platform uses HTTPS. Substitute your organization for
- # ORGNAME in the URL and validation key.
- #
- # If you have your own Chef Server, use the appropriate URL, which may be
- # HTTP instead of HTTPS depending on your configuration. Also change the
- # validation key to validation.pem.
- #
- # config.vm.provision :chef_client do |chef|
- # chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
- # chef.validation_key_path = "ORGNAME-validator.pem"
- # end
- #
- # If you're using the Opscode platform, your validator client is
- # ORGNAME-validator, replacing ORGNAME with your organization name.
- #
- # If you have your own Chef Server, the default validation client name is
- # chef-validator, unless you changed the configuration.
- #
- # chef.validation_client_name = "ORGNAME-validator"
end
$setup_script = <<SCRIPT
diff --git a/requirements.txt b/requirements.txt
index 76bf399..b8c18a8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,30 +1,14 @@
+# These are sub-dependencies that we need to pin to avoid version conflicts
+pyasn1>=0.1.8
+# These are dependencies of oonibackend specifically
PyYaml
-Twisted>=12.2.0
-#https://pypi.python.org/packages/source/T/Twisted/Twisted-13.0.0.tar.bz2#md5=68afff4e1efd3757d934e39f70c99f57#egg=Twisted
+Twisted>=13.2.0
cyclone>=1.1
-#https://pypi.python.org/packages/source/c/cyclone/cyclone-1.1.tar.gz#md5=477c5ef9cf8902e37105fe450c4d8c5d#egg=cyclone
ipaddr>=2.1.10
-#https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b077b19773d4f1b5f1ef88b26f6650ce0#egg=ipaddr
pygeoip>=0.2.6
-#https://pypi.python.org/packages/source/p/pygeoip/pygeoip-0.2.6.zip#md5=b3ac1bfcd535782bc59af78e722cf5c1#egg=pygeoip
-##
-## Originally fetched from the hg repo on secdev.org:
-## https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy
-## This is a Tor Project mirror with valid SSL/TLS certs that is stable and fast:
-##
-transaction>=1.4.1
-#https://pypi.python.org/packages/source/s/storm/storm-0.19.tar.gz#md5=61d1ee4cd2a08639ab917e43fa2c9265#egg=storm
txtorcon>=0.7
pyOpenSSL>=0.13
zope.component>=4.0.0
zope.event>=4.0.0
zope.interface>=4.0.1
-##
-## pysqlite2 is required for sqlite support in Storm, see
-## https://storm.canonical.com/Manual#Dependencies-2
-##
-## If not installed, Storm and ooni-backend will still work, but will keep an
-## in-memory database, which in some cases may slow the server.
-##
-pysqlite>=2.6.0
service-identity
More information about the tor-commits
mailing list