diff options
| -rw-r--r-- | Vagrantfile | 6 | ||||
| -rw-r--r-- | provisioning/modules/pixelated/manifests/source.pp | 1 | ||||
| -rw-r--r-- | service/develop_requirements.txt | 13 | ||||
| -rwxr-xr-x | service/go | 4 | ||||
| -rw-r--r-- | service/requirements.txt | 10 | ||||
| -rw-r--r-- | service/setup.py | 11 |
6 files changed, 14 insertions, 31 deletions
diff --git a/Vagrantfile b/Vagrantfile index bcce292e..30e8c89b 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -10,11 +10,7 @@ unless Vagrant.has_plugin?('vagrant-vbguest') end Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - config.vm.box = "debian/jessie64" - config.vm.box_version = "= 8.2.1" - - config.vm.provision "shell", inline: "sudo /etc/init.d/vboxadd setup" - config.vm.provision "shell", inline: "apt-get install -y puppet" + config.vm.box = "LEAP/jessie" config.vm.define "source", primary: true do |source| source.vm.provision "puppet" do |puppet| diff --git a/provisioning/modules/pixelated/manifests/source.pp b/provisioning/modules/pixelated/manifests/source.pp index 1490a06a..8dd9a1d0 100644 --- a/provisioning/modules/pixelated/manifests/source.pp +++ b/provisioning/modules/pixelated/manifests/source.pp @@ -3,6 +3,7 @@ class pixelated::source { package { [ 'git', + 'bzr', 'nodejs-legacy', 'python-dev', 'python-virtualenv', diff --git a/service/develop_requirements.txt b/service/develop_requirements.txt index e4c2dce3..1bc64941 100644 --- a/service/develop_requirements.txt +++ b/service/develop_requirements.txt @@ -1,5 +1,12 @@ ---allow-external u1db --allow-unverified u1db ---allow-external dirspec --allow-unverified dirspec +--index-url https://pypi.python.org/simple/ + +-e 'bzr+http://bazaar.launchpad.net/~ubuntuone-control-tower/dirspec/trunk#egg=dirspec' +-e 'bzr+http://bazaar.launchpad.net/~ubuntuone-control-tower/u1db/trunk#egg=u1db' + +pyasn1==0.1.8 +requests==2.0.0 +srp==1.0.4 +whoosh==2.5.7 -e 'git+https://github.com/pixelated-project/leap_pycommon.git@develop#egg=leap.common' -e 'git+https://github.com/pixelated-project/leap_auth.git#egg=leap.auth' -e 'git+https://github.com/pixelated-project/soledad.git@develop#egg=leap.soledad.common&subdirectory=common/' @@ -7,4 +14,4 @@ -e 'git+https://github.com/pixelated-project/soledad.git@develop#egg=leap.soledad.server&subdirectory=server/' -e 'git+https://github.com/pixelated-project/keymanager.git@develop#egg=leap.keymanager' -e 'git+https://github.com/pixelated-project/leap_mail.git@develop#egg=leap.mail' - +-e . @@ -17,11 +17,9 @@ function resolveNumOfCores { function setuppy { echo "Installing Pixelated User Agent." + pip install --upgrade pip setuptools pip install -r develop_requirements.txt pip install -r test_requirements.txt - python setup.py develop $* - pip uninstall -y scrypt; pip install scrypt - pip uninstall -y gnupg; pip install gnupg==2.0.2 echo "Done." } diff --git a/service/requirements.txt b/service/requirements.txt deleted file mode 100644 index e4c2dce3..00000000 --- a/service/requirements.txt +++ /dev/null @@ -1,10 +0,0 @@ ---allow-external u1db --allow-unverified u1db ---allow-external dirspec --allow-unverified dirspec --e 'git+https://github.com/pixelated-project/leap_pycommon.git@develop#egg=leap.common' --e 'git+https://github.com/pixelated-project/leap_auth.git#egg=leap.auth' --e 'git+https://github.com/pixelated-project/soledad.git@develop#egg=leap.soledad.common&subdirectory=common/' --e 'git+https://github.com/pixelated-project/soledad.git@develop#egg=leap.soledad.client&subdirectory=client/' --e 'git+https://github.com/pixelated-project/soledad.git@develop#egg=leap.soledad.server&subdirectory=server/' --e 'git+https://github.com/pixelated-project/keymanager.git@develop#egg=leap.keymanager' --e 'git+https://github.com/pixelated-project/leap_mail.git@develop#egg=leap.mail' - diff --git a/service/setup.py b/service/setup.py index ba2be0ec..53a8f715 100644 --- a/service/setup.py +++ b/service/setup.py @@ -47,16 +47,7 @@ setup(name='pixelated-user-agent', 'pixelated.resources', 'pixelated.extensions' ], - install_requires=[ - 'pyasn1==0.1.8', - 'requests==2.0.0', - 'srp==1.0.4', - 'dirspec==4.2.0', - 'u1db==13.09', - # 'leap.mail>=0.4.0', # not in a stable repo yet, see requirements.txt - 'leap.auth==0.1.2', - 'whoosh==2.5.7' - ], + install_requires=[], entry_points={ 'console_scripts': [ 'pixelated-user-agent = pixelated.application:initialize', |