Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make generate_objects.py and rand_readwrite.py inside the package.
Handle dependencies properly. Now e.g. "./bootstrap && ./virtualenv/bin/s3tests-test-readwrite" should just work.
- Loading branch information
Tommi Virtanen
committed
Jul 13, 2011
1 parent
33b25c5
commit 02a4c82
Showing
8 changed files
with
61 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,7 @@ | |
*.pyc | ||
*.pyo | ||
|
||
/*.egg-info | ||
/virtualenv | ||
|
||
config.yml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,28 @@ | ||
#!/bin/sh | ||
set -e | ||
|
||
for package in python-pip python-virtualenv python-dev libevent-dev; do | ||
if [ "$(dpkg --status -- $package|sed -n 's/^Status: //p')" != "install ok installed" ]; then | ||
# add a space after old values | ||
missing="${missing:+$missing }$package" | ||
fi | ||
done | ||
if [ -n "$missing" ]; then | ||
echo "$0: missing required packages, please install them:" 1>&2 | ||
echo "sudo apt-get install $missing" | ||
exit 1 | ||
fi | ||
|
||
virtualenv --no-site-packages --distribute virtualenv | ||
|
||
# avoid pip bugs | ||
./virtualenv/bin/pip install --upgrade pip | ||
|
||
./virtualenv/bin/pip install -r requirements.txt | ||
|
||
# forbid setuptools from using the network because it'll try to use | ||
# easy_install, and we really wanted pip; next line will fail if pip | ||
# requirements.txt does not match setup.py requirements -- sucky but | ||
# good enough for now | ||
./virtualenv/bin/python setup.py develop \ | ||
--allow-hosts None |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -194,6 +194,3 @@ def main(): | |
# cleanup | ||
if options.cleanup: | ||
common.teardown() | ||
|
||
if __name__ == "__main__": | ||
main() |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
#!/usr/bin/python | ||
from setuptools import setup, find_packages | ||
|
||
setup( | ||
name='s3tests', | ||
version='0.0.1', | ||
packages=find_packages(), | ||
|
||
author='Tommi Virtanen', | ||
author_email='tommi.virtanen@dreamhost.com', | ||
description='Unofficial Amazon AWS S3 compatibility tests', | ||
license='MIT', | ||
keywords='s3 web testing', | ||
|
||
install_requires=[ | ||
'boto >=2.0b4', | ||
'PyYAML', | ||
'bunch >=1.0.0', | ||
'gevent ==0.13.6', | ||
], | ||
|
||
entry_points={ | ||
'console_scripts': [ | ||
's3tests-generate-objects = s3tests.generate_objects:main', | ||
's3tests-test-readwrite = s3tests.rand_readwrite:main', | ||
], | ||
}, | ||
|
||
) |