allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [1/4] git commit: Revert "[#5973] crazy pysvn hacking so that packaging tools know it is in the venv"
Date Wed, 03 Apr 2013 14:01:18 GMT
Updated Branches:
  refs/heads/master 6127cf7ac -> 3fec1d22d


Revert "[#5973] crazy pysvn hacking so that packaging tools know it is in the venv"

This reverts commit dcf934e01089bc71a81939009abeb6145373e675.

Let's handle pysvn simply instead of being tricky.


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/eeb743b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/eeb743b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/eeb743b9

Branch: refs/heads/master
Commit: eeb743b98d1dc213749517905faa5e0bd1d8f731
Parents: 6127cf7
Author: Dave Brondsema <dbrondsema@slashdotmedia.com>
Authored: Wed Apr 3 09:49:02 2013 -0400
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Wed Apr 3 09:49:02 2013 -0400

----------------------------------------------------------------------
 README.markdown                               |    3 +--
 vagrant/manifests/ubuntu-1204-server-amd64.pp |    5 -----
 2 files changed, 1 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/eeb743b9/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index 198a0f0..bbd03cb 100644
--- a/README.markdown
+++ b/README.markdown
@@ -62,10 +62,9 @@ Although the application setup.py files define a number of dependencies,
the `re
 
 This will take a while.  If you get an error from pip, it is typically a temporary download
error.  Just run the command again and it will quickly pass through the packages it already
downloaded and then continue.
 
-Optional, for SVN support: symlink the system pysvn package into our virtual environment
and make packaging utilities know its there.
+Optional, for SVN support: symlink the system pysvn package into our virtual environment
 
     (anvil)~/src/allura$ ln -s /usr/lib/python2.7/dist-packages/pysvn ~/anvil/lib/python2.7/site-packages/
-    (anvil)~/src/allura$ mkdir ~/anvil/lib/python2.7/site-packages/pysvn-1.7.5-py2.7.egg-info
 
 And now to setup the Allura applications for development.  If you want to setup all of them,
run `./rebuild-all.bash`
 If you only want to use a few tools, run:

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/eeb743b9/vagrant/manifests/ubuntu-1204-server-amd64.pp
----------------------------------------------------------------------
diff --git a/vagrant/manifests/ubuntu-1204-server-amd64.pp b/vagrant/manifests/ubuntu-1204-server-amd64.pp
index 6206350..d80e22a 100644
--- a/vagrant/manifests/ubuntu-1204-server-amd64.pp
+++ b/vagrant/manifests/ubuntu-1204-server-amd64.pp
@@ -102,11 +102,6 @@ file { '/home/vagrant/anvil/lib/python2.7/site-packages/pysvn':
   target => '/usr/lib/python2.7/dist-packages/pysvn',
   require => [ Package[ "python-svn" ], Exec[ "pip install" ]],
 }
-# and trick pip/setuptools etc to know its there
-file { '/home/vagrant/anvil/lib/python2.7/site-packages/pysvn-1.7.5-py2.7.egg-info':
-  ensure => 'directory',
-  require => File['/home/vagrant/anvil/lib/python2.7/site-packages/pysvn'],
-}
 
 # create SCM repo dirs
 file { [ "/home/vagrant/scm", "/home/vagrant/scm/git", "/home/vagrant/scm/hg", "/home/vagrant/scm/svn"
]:


Mime
View raw message