Commit 8a1043ca authored by Kostas Papadimitriou's avatar Kostas Papadimitriou
Browse files

Added snf-common package

split out of some commonly used code in a seperate package
parent a17d60e3
......@@ -42,30 +42,48 @@ virtualenv --no-site-packages -ppython2.6 env
source env/bin/activate
export PIP_DOWNLOAD_CACHE=/tmp/.pip_cache
pip install -r requirements.pip
rm -rf build dist
python setup.py sdist
pip install dist/synnefo-*.tar.gz
cd env
# avoid vncauthproxy errors
rm bin/vncauthproxy.py
echo "running django tests..." >&2
snf-manage test aai admin api db helpdesk invitations logic userdata --settings=synnefo.settings.test
cd ..
deactivate
rm -rf env
virtualenv --no-site-packages -ppython2.7 env
source env/bin/activate
export PIP_DOWNLOAD_CACHE=/tmp/.pip_cache
pip install -r requirements.pip
cd snf-common
rm -rf build dist
python setup.py install
cd ../snf-app
rm -rf build dist
python setup.py install
cd ../snf-ganeti-tools
rm -rf build dist
python setup.py sdist
pip install dist/synnefo-*.tar.gz
cd env
python setup.py install
cd ../env
# avoid vncauthproxy errors
rm bin/vncauthproxy.py
echo "running django tests..." >&2
export SYNNEFO_SETTINGS_DIR=/etc/lala
snf-manage test aai admin api db helpdesk invitations logic userdata --settings=synnefo.settings.test
cd ..
deactivate
rm -rf env
#rm -rf env
#virtualenv --no-site-packages -ppython2.7 env
#source env/bin/activate
#export PIP_DOWNLOAD_CACHE=/tmp/.pip_cache
#pip install -r requirements.pip
#cd snf-common
#rm -rf build dist
#python setup.py install
#cd ../snf-app
#rm -rf build dist
#python setup.py install
#cd ../snf-ganeti-tools
#rm -rf build dist
#python setup.py install
#cd env
## avoid vncauthproxy errors
#rm bin/vncauthproxy.py
#echo "running django tests..." >&2
#snf-manage test aai admin api db helpdesk invitations logic userdata --settings=synnefo.settings.test
#cd ..
#deactivate
#rm -rf env
......@@ -38,9 +38,8 @@
set -e
echo "Running snf-app tests..." >&2
export PYTHONPATH=$PYTHONPATH:./snf-app
python snf-app/synnefo/manage.py test aai admin api db helpdesk invitations logic userdata --settings=synnefo.settings.test
python snf-manage test aai admin api db helpdesk invitations logic userdata --settings=synnefo.settings.test
echo "Running snf-ganeti-tools tests..." >&2
PYTHONPATH=snf-ganeti-tools:$PYTHONPATH ./snf-ganeti-tools/test/synnefo.ganeti_unittest.py
./snf-ganeti-tools/test/synnefo.ganeti_unittest.py
......@@ -40,12 +40,12 @@ import os
from distutils.util import convert_path
from fnmatch import fnmatchcase
from setuptools import setup, find_packages
from synnefo.version import get_version
from synnefo.version import vcs_version
HERE = os.path.abspath(os.path.normpath(os.path.dirname(__file__)))
# Package info
VERSION = get_version().replace(" ","")
VERSION = vcs_version()
README = open(os.path.join(HERE, 'README')).read()
CHANGES = open(os.path.join(HERE, 'Changelog')).read()
SHORT_DESCRIPTION = 'Package short description'
......@@ -171,7 +171,7 @@ def find_package_data(
return out
setup(
name = 'synnefo',
name = 'snf-app',
version = VERSION,
license = 'BSD',
url = 'http://code.grnet.gr/',
......@@ -202,6 +202,10 @@ setup(
'snf-admin = synnefo.tools.admin:main',
'snf-cloud = synnefo.tools.cloud:main',
],
'synnefo': [
'settings = synnefo.app_settings',
'apps = synnefo.app_settings:getapps',
]
},
)
from synnefo.app_settings.default import *
def getapps():
return INSTALLED_APPS
......@@ -31,21 +31,21 @@
# interpreted as representing official policies, either expressed
# or implied, of GRNET S.A.
from synnefo.settings.common.admins import *
from synnefo.settings.common.apps import *
from synnefo.settings.common.deploy import *
from synnefo.settings.common.logging import *
from synnefo.settings.common.site import *
from synnefo.settings.common.backend import *
from synnefo.settings.common.database import *
from synnefo.settings.common.queues import *
from synnefo.settings.common.api import *
from synnefo.settings.common.plankton import *
from synnefo.settings.common.ui import *
from synnefo.settings.common.userdata import *
from synnefo.settings.common.aai import *
from synnefo.settings.common.invitations import *
from synnefo.settings.common.reconciliation import *
from synnefo.settings.common.helpdesk import *
from synnefo.settings.common.tests import *
from synnefo.app_settings.default.admins import *
from synnefo.app_settings.default.apps import *
from synnefo.app_settings.default.deploy import *
from synnefo.app_settings.default.logging import *
from synnefo.app_settings.default.site import *
from synnefo.app_settings.default.backend import *
from synnefo.app_settings.default.database import *
from synnefo.app_settings.default.queues import *
from synnefo.app_settings.default.api import *
from synnefo.app_settings.default.plankton import *
from synnefo.app_settings.default.ui import *
from synnefo.app_settings.default.userdata import *
from synnefo.app_settings.default.aai import *
from synnefo.app_settings.default.invitations import *
from synnefo.app_settings.default.reconciliation import *
from synnefo.app_settings.default.helpdesk import *
from synnefo.app_settings.default.tests import *
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment