You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/04/03 16:01:18 UTC
[1/4] git commit: Revert "[#5973] crazy pysvn hacking so that
packaging tools know it is in the venv"
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 <db...@slashdotmedia.com>
Authored: Wed Apr 3 09:49:02 2013 -0400
Committer: Dave Brondsema <db...@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" ]:
[4/4] git commit: [#5973] remove another reference to
system-site-packages
Posted by br...@apache.org.
[#5973] remove another reference to system-site-packages
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/3fec1d22
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/3fec1d22
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/3fec1d22
Branch: refs/heads/master
Commit: 3fec1d22d18081ab9a6ef62d5625e88ab825a1e1
Parents: 3a3e769
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Wed Apr 3 10:00:30 2013 -0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Apr 3 10:00:30 2013 -0400
----------------------------------------------------------------------
README.markdown | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3fec1d22/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index bbd03cb..2c42397 100644
--- a/README.markdown
+++ b/README.markdown
@@ -41,7 +41,7 @@ Once you have virtualenv installed, you need to create a virtual environment. W
~$ virtualenv anvil
This gives us a nice, clean environment into which we can install all the allura dependencies.
-(The --system-site-packages flag is to include the python-svn package). In order to use the virtual environment, you'll need to activate it:
+In order to use the virtual environment, you'll need to activate it:
~$ . anvil/bin/activate
[3/4] git commit: [#5973] simple pysvn import check
Posted by br...@apache.org.
[#5973] simple pysvn import check
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/3a3e769b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/3a3e769b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/3a3e769b
Branch: refs/heads/master
Commit: 3a3e769b2fc82ac9950ac8cced1239b976d6a4d5
Parents: 2400a31
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Wed Apr 3 09:55:33 2013 -0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Apr 3 09:55:33 2013 -0400
----------------------------------------------------------------------
ForgeSVN/setup.py | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3a3e769b/ForgeSVN/setup.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/setup.py b/ForgeSVN/setup.py
index fba4631..cb36ced 100644
--- a/ForgeSVN/setup.py
+++ b/ForgeSVN/setup.py
@@ -3,6 +3,15 @@ import sys, os
from forgesvn.version import __version__
+# "install_requires" can't be safely used with pysvn since pysvn is packaged
+# strangely and is not always known to packaging tools (setup.py, pip) even
+# when it is installed and can be imported and used
+try:
+ import pysvn
+except ImportError:
+ print '\npysvn must be installed for ForgeSVN to work\n'
+ raise
+
setup(name='ForgeSVN',
version=__version__,
description="",
[2/4] git commit: Revert "[#5973] Make the pysvn dep explicit,
so we fail sooner (setup.py develop instead of runtime import)"
Posted by br...@apache.org.
Revert "[#5973] Make the pysvn dep explicit, so we fail sooner (setup.py develop instead of runtime import)"
This reverts commit b0c97b952b3671f0e45c7f030ba920bf280abffa.
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/2400a31d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/2400a31d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/2400a31d
Branch: refs/heads/master
Commit: 2400a31d93c5cc93d6a817148dcff258b2799f21
Parents: eeb743b
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Wed Apr 3 09:49:38 2013 -0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Apr 3 09:49:38 2013 -0400
----------------------------------------------------------------------
ForgeSVN/setup.py | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2400a31d/ForgeSVN/setup.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/setup.py b/ForgeSVN/setup.py
index dbd6932..fba4631 100644
--- a/ForgeSVN/setup.py
+++ b/ForgeSVN/setup.py
@@ -19,8 +19,7 @@ setup(name='ForgeSVN',
zip_safe=False,
install_requires=[
# -*- Extra requirements: -*-
- 'Allura',
- 'pysvn',
+ 'Allura'
],
entry_points="""
# -*- Entry points: -*-