Added OpenStack dev things

Added a pbr-based build system and a tox file and some requirements files. Also moved the apps to all be under storyboard so that a publication to PyPI won't do evil things from an install perspective.
ttx · Jul 15, 2013 · d035720 · d035720
1 parent df633a7
commit d035720
Show file tree

Hide file tree

Showing 52 changed files with 130 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,8 @@
 *.db
 *~
 local_settings.py
+storyboard.db
+.tox
+AUTHORS
+ChangeLog
+*.egg-info
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,6 @@
+include AUTHORS
+include ChangeLog
+exclude .gitignore
+exclude .gitreview
+
+global-exclude *.pyc
diff --git a/README.rst b/README.rst
@@ -118,9 +118,13 @@ Prerequisites
 
 You'll need the following Python modules installed:
  - django (1.4+)
- - python-django-auth-openid
- - python-markdown
+ - django-openid-auth
+ - markdown
+ - python-openid
 
+You can get them by running::
+
+  pip install -r requirements.txt
 
 Configuration and DB creation
 -----------------------------

diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,7 @@
+d2to1>=0.2.10,<0.3
+pbr>=0.5.10,<0.6
+
+django>=1.4
+django-openid-auth
+markdown
+python-openid
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,30 @@
+[metadata]
+name = storyboard
+summary = OpenStack StoryBoard
+description-file =
+    README.rst
+author = OpenStack
+author-email = openstack-dev@lists.openstack.org
+home-page = http://www.openstack.org/
+classifier =
+    Environment :: OpenStack
+    Framework :: Django
+    Intended Audience :: Developers
+    Intended Audience :: Information Technology
+    Intended Audience :: System Administrators
+    License :: OSI Approved :: Apache Software License
+    Operating System :: OS Independent
+    Operating System :: POSIX :: Linux
+    Programming Language :: Python
+    Programming Language :: Python :: 2
+    Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 2.6
+    Topic :: Internet :: WWW/HTTP
+
+[global]
+setup-hooks =
+    pbr.hooks.setup_hook
+
+[files]
+packages =
+    storyboard
diff --git a/setup.py b/setup.py
@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import setuptools
+
+setuptools.setup(
+    setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5.10,<0.6'],
+    d2to1=True)
diff --git a/about/__init__.py → storyboard/about/__init__.py b/about/__init__.py → storyboard/about/__init__.py
diff --git a/about/static/css/bootstrap-responsive.css → ...about/static/css/bootstrap-responsive.css b/about/static/css/bootstrap-responsive.css → ...about/static/css/bootstrap-responsive.css
diff --git a/...t/static/css/bootstrap-responsive.min.css → ...t/static/css/bootstrap-responsive.min.css b/...t/static/css/bootstrap-responsive.min.css → ...t/static/css/bootstrap-responsive.min.css
diff --git a/about/static/css/bootstrap.css → storyboard/about/static/css/bootstrap.css b/about/static/css/bootstrap.css → storyboard/about/static/css/bootstrap.css
diff --git a/about/static/css/bootstrap.min.css → ...yboard/about/static/css/bootstrap.min.css b/about/static/css/bootstrap.min.css → ...yboard/about/static/css/bootstrap.min.css
diff --git a/...static/img/glyphicons-halflings-white.png → ...static/img/glyphicons-halflings-white.png b/...static/img/glyphicons-halflings-white.png → ...static/img/glyphicons-halflings-white.png
diff --git a/about/static/img/glyphicons-halflings.png → ...about/static/img/glyphicons-halflings.png b/about/static/img/glyphicons-halflings.png → ...about/static/img/glyphicons-halflings.png
diff --git a/about/static/js/bootstrap.js → storyboard/about/static/js/bootstrap.js b/about/static/js/bootstrap.js → storyboard/about/static/js/bootstrap.js
diff --git a/about/static/js/bootstrap.min.js → storyboard/about/static/js/bootstrap.min.js b/about/static/js/bootstrap.min.js → storyboard/about/static/js/bootstrap.min.js
diff --git a/about/static/js/jquery.min.js → storyboard/about/static/js/jquery.min.js b/about/static/js/jquery.min.js → storyboard/about/static/js/jquery.min.js
diff --git a/about/templates/about.base.html → storyboard/about/templates/about.base.html b/about/templates/about.base.html → storyboard/about/templates/about.base.html
diff --git a/about/templates/about.welcome.html → ...yboard/about/templates/about.welcome.html b/about/templates/about.welcome.html → ...yboard/about/templates/about.welcome.html
diff --git a/about/templates/base.html → storyboard/about/templates/base.html b/about/templates/base.html → storyboard/about/templates/base.html
diff --git a/about/urls.py → storyboard/about/urls.py b/about/urls.py → storyboard/about/urls.py
@@ -16,6 +16,6 @@
 from django.conf.urls.defaults import *
 
 
-urlpatterns = patterns('about.views',
+urlpatterns = patterns('storyboard.about.views',
     (r'^$', 'welcome'),
 )
diff --git a/about/views.py → storyboard/about/views.py b/about/views.py → storyboard/about/views.py
diff --git a/projects/__init__.py → storyboard/projects/__init__.py b/projects/__init__.py → storyboard/projects/__init__.py
diff --git a/projects/admin.py → storyboard/projects/admin.py b/projects/admin.py → storyboard/projects/admin.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from projects.models import Project, Series, Milestone
+from storyboard.projects.models import Project, Series, Milestone
 from django.contrib import admin
 
 

diff --git a/projects/models.py → storyboard/projects/models.py b/projects/models.py → storyboard/projects/models.py
diff --git a/projects/templates/projects.base.html → ...ard/projects/templates/projects.base.html b/projects/templates/projects.base.html → ...ard/projects/templates/projects.base.html
diff --git a/projects/templates/projects.dashboard.html → ...rojects/templates/projects.dashboard.html b/projects/templates/projects.dashboard.html → ...rojects/templates/projects.dashboard.html
diff --git a/projects/templates/projects.list.html → ...ard/projects/templates/projects.list.html b/projects/templates/projects.list.html → ...ard/projects/templates/projects.list.html
diff --git a/projects/templates/projects.list_tasks.html → ...ojects/templates/projects.list_tasks.html b/projects/templates/projects.list_tasks.html → ...ojects/templates/projects.list_tasks.html
diff --git a/projects/templates/projects.project.html → .../projects/templates/projects.project.html b/projects/templates/projects.project.html → .../projects/templates/projects.project.html
diff --git a/projects/urls.py → storyboard/projects/urls.py b/projects/urls.py → storyboard/projects/urls.py
@@ -16,7 +16,7 @@
 from django.conf.urls.defaults import *
 
 
-urlpatterns = patterns('projects.views',
+urlpatterns = patterns('storyboard.projects.views',
     (r'^$', 'default_list'),
     (r'^(\S+)/bugs/triage$', 'list_bugtriage'),
     (r'^(\S+)/bugs$', 'list_bugtasks'),

diff --git a/projects/views.py → storyboard/projects/views.py b/projects/views.py → storyboard/projects/views.py
@@ -20,8 +20,8 @@
 from django.http import HttpResponseRedirect, HttpResponseForbidden
 from django.shortcuts import render
 
-from projects.models import Project
-from stories.models import Task
+from storyboard.projects.models import Project
+from storyboard.stories.models import Task
 
 def default_list(request):
     return render(request, "projects.list.html", {

diff --git a/storyboard/settings.py b/storyboard/settings.py
@@ -133,9 +133,9 @@
     'django.contrib.staticfiles',
     'django_openid_auth',
     'django.contrib.admin',
-    'about',
-    'projects',
-    'stories',
+    'storyboard.about',
+    'storyboard.projects',
+    'storyboard.stories',
 ]
 
 AUTHENTICATION_BACKENDS = (

diff --git a/stories/__init__.py → storyboard/stories/__init__.py b/stories/__init__.py → storyboard/stories/__init__.py
diff --git a/stories/admin.py → storyboard/stories/admin.py b/stories/admin.py → storyboard/stories/admin.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from stories.models import Story, Task, Comment, StoryTag
+from storyboard.stories.models import Story, Task, Comment, StoryTag
 from django.contrib import admin
 
 

diff --git a/stories/models.py → storyboard/stories/models.py b/stories/models.py → storyboard/stories/models.py
@@ -15,7 +15,7 @@
 
 from django.db import models
 from django.contrib.auth.models import User
-from projects.models import Project, Series, Milestone
+from storyboard.projects.models import Project, Series, Milestone
 
 
 class Story(models.Model):

diff --git a/stories/templates/stories.base.html → ...board/stories/templates/stories.base.html b/stories/templates/stories.base.html → ...board/stories/templates/stories.base.html
diff --git a/stories/templates/stories.dashboard.html → .../stories/templates/stories.dashboard.html b/stories/templates/stories.dashboard.html → .../stories/templates/stories.dashboard.html
diff --git a/...ies/templates/stories.modal_addstory.html → ...ies/templates/stories.modal_addstory.html b/...ies/templates/stories.modal_addstory.html → ...ies/templates/stories.modal_addstory.html
diff --git a/stories/templates/stories.modal_addtask.html → ...ries/templates/stories.modal_addtask.html b/stories/templates/stories.modal_addtask.html → ...ries/templates/stories.modal_addtask.html
diff --git a/stories/templates/stories.modal_deltask.html → ...ries/templates/stories.modal_deltask.html b/stories/templates/stories.modal_deltask.html → ...ries/templates/stories.modal_deltask.html
diff --git a/...ies/templates/stories.modal_editprio.html → ...ies/templates/stories.modal_editprio.html b/...ies/templates/stories.modal_editprio.html → ...ies/templates/stories.modal_editprio.html
diff --git a/...es/templates/stories.modal_editstory.html → ...es/templates/stories.modal_editstory.html b/...es/templates/stories.modal_editstory.html → ...es/templates/stories.modal_editstory.html
diff --git a/...ies/templates/stories.modal_edittask.html → ...ies/templates/stories.modal_edittask.html b/...ies/templates/stories.modal_edittask.html → ...ies/templates/stories.modal_edittask.html
diff --git a/stories/templates/stories.view.html → ...board/stories/templates/stories.view.html b/stories/templates/stories.view.html → ...board/stories/templates/stories.view.html
diff --git a/stories/templatetags/__init__.py → storyboard/stories/templatetags/__init__.py b/stories/templatetags/__init__.py → storyboard/stories/templatetags/__init__.py
diff --git a/stories/templatetags/storyviewfilters.py → .../stories/templatetags/storyviewfilters.py b/stories/templatetags/storyviewfilters.py → .../stories/templatetags/storyviewfilters.py
diff --git a/stories/tests.py → storyboard/stories/tests.py b/stories/tests.py → storyboard/stories/tests.py
diff --git a/stories/urls.py → storyboard/stories/urls.py b/stories/urls.py → storyboard/stories/urls.py
@@ -16,7 +16,7 @@
 from django.conf.urls.defaults import *
 
 
-urlpatterns = patterns('stories.views',
+urlpatterns = patterns('storyboard.stories.views',
     (r'^$', 'dashboard'),
     (r'^(\d+)$', 'view'),
     (r'^(\d+)/addtask$', 'add_task'),

diff --git a/stories/views.py → storyboard/stories/views.py b/stories/views.py → storyboard/stories/views.py
@@ -18,8 +18,9 @@
 from django.http import HttpResponseRedirect, HttpResponseForbidden
 from django.shortcuts import render
 from django.contrib.auth.models import User
-from projects.models import Project, Milestone, Series
-from stories.models import Story, Task, Comment, StoryTag
+
+from storyboard.projects.models import Project, Milestone, Series
+from storyboard.stories.models import Story, Task, Comment, StoryTag
 
 def dashboard(request):
     recent_bugs = Story.objects.order_by("-id")[:5]

diff --git a/storyboard/urls.py b/storyboard/urls.py
@@ -21,10 +21,10 @@
 
 urlpatterns = patterns('',
     (r'^openid/', include('django_openid_auth.urls')),
-    (r'^$', 'about.views.welcome'),
-    (r'^about/',  include('about.urls')),
-    (r'^project/',  include('projects.urls')),
-    (r'^story/',  include('stories.urls')),
+    (r'^$', 'storyboard.about.views.welcome'),
+    (r'^about/',  include('storyboard.about.urls')),
+    (r'^project/',  include('storyboard.projects.urls')),
+    (r'^story/',  include('storyboard.stories.urls')),
     url(r'^admin/', include(admin.site.urls)),
-    (r'^logout$', 'about.views.dologout'),
+    (r'^logout$', 'storyboard.about.views.dologout'),
 )
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -0,0 +1,7 @@
+hacking>=0.5.3,<0.6
+
+coverage
+discover
+fixtures>=0.3.12
+testrepository>=0.0.13
+testtools>=0.9.26
diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,29 @@
+[tox]
+envlist = py26,py27,py33,pep8
+
+[testenv]
+setenv = VIRTUAL_ENV={envdir}
+         LANG=en_US.UTF-8
+         LANGUAGE=en_US:en
+         LC_ALL=C
+
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+commands = python setup.py testr --testr-args='{posargs}'
+
+[testenv:pep8]
+commands = flake8
+
+[testenv:venv]
+commands = {posargs}
+
+[testenv:cover]
+commands = python setup.py testr --coverage --testr-args='{posargs}'
+
+[tox:jenkins]
+downloadcache = ~/cache/pip
+
+[flake8]
+ignore = H
+show-source = True
+exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build