Commit a2a0c8cb authored by Kostas Papadimitriou's avatar Kostas Papadimitriou
Browse files

Merge branch 'packaging-kpap'

parents 1c43da2a 0aab4396
......@@ -160,10 +160,12 @@ def builddeb(p, master="master", branch="debian-0.8"):
with lcd(package_root(p)):
with settings(warn_only=True):
local("mkdir .git")
local("python setup.py clean")
local("git add synnefo/versions/*.py -f")
local("git-buildpackage --git-upstream-branch=%s --git-debian-branch=%s \
--git-export=INDEX --git-ignore-new" % (master, branch))
local("rm -rf .git")
local("git co .")
local("git reset synnefo/versions/*.py")
def builddeball(b="debian-0.8"):
......
......@@ -199,7 +199,6 @@ setup(
entry_points = {
'console_scripts': [
'snf-manage = synnefo.manage:main',
'snf-dispatcher = synnefo.logic.dispatcher:scriptmain',
'snf-burnin = synnefo.tools.burnin:main',
'snf-admin = synnefo.tools.admin:main',
......
......@@ -3,6 +3,9 @@
# API configuration
#####################
DEBUG = False
# Top-level URL for deployment. Numerous other URLs depend on this.
APP_INSTALL_URL = "https://host:port"
......
......@@ -3,7 +3,6 @@
# UI settings
###################
from synnefo.webproject.settings.default.site import *
from synnefo.settings.default.admins import *
# API URL
......
......@@ -42,8 +42,8 @@ import sys
import os
path = os.path.normpath(os.path.join(os.getcwd(), '..'))
sys.path.append(path)
import synnefo.settings as settings
from synnefo import settings
setup_environ(settings)
from amqplib import client_0_8 as amqp
......
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