summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2016-02-22 20:57:42 +0200
committerLars Wirzenius <liw@liw.fi>2016-02-22 20:59:53 +0200
commitfdbcf82906fe978cae62dcc70dbd18c013261b8d (patch)
tree18e889da407138d12ee6fafd10b58c61607a4c89
parent48681e1ff77d1d42baf76dac0be1e52dc1d0c671 (diff)
downloaddistix-fdbcf82906fe978cae62dcc70dbd18c013261b8d.tar.gz
Replace use of bottle with jinj2
-rw-r--r--ARCH5
-rw-r--r--debian/changelog3
-rw-r--r--debian/control4
-rw-r--r--distixlib/plugins/show_plugin.py1
4 files changed, 6 insertions, 7 deletions
diff --git a/ARCH b/ARCH
index 3aa7dae..f48e8d7 100644
--- a/ARCH
+++ b/ARCH
@@ -142,9 +142,8 @@ elsewhere, for extra flexibility and theming.
The use of templates is important. Avoiding to hardcode what is output
and how it's laid out is a good thing from flexibility, and doing it
-from the beginning avoids accidentally hardcoding things. Since the
-web interface is likely to be implemented using bottle.py, I'll use
-bottle's templating system.
+from the beginning avoids accidentally hardcoding things. The jinj2
+templating libary is used.
Ingesting e-mails
diff --git a/debian/changelog b/debian/changelog
index 4f52f44..97f002b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
distix (0.4+git-1) UNRELEASED; urgency=medium
- *
+ * Replace build and runtime dependency on python-bottle with
+ python-jinja2.
-- Lars Wirzenius <liw@liw.fi> Sat, 20 Feb 2016 22:18:00 +0200
diff --git a/debian/control b/debian/control
index accf452..9af2296 100644
--- a/debian/control
+++ b/debian/control
@@ -5,13 +5,13 @@ Section: utils
Priority: optional
Standards-Version: 3.9.5
Build-Depends: debhelper (>= 7.3.8), python-all (>= 2.6.6-3~),
- python-yaml, git, python-cliapp, python-bottle
+ python-yaml, git, python-cliapp, python-jinja2
X-Python-Version: >= 2.6
Package: distix
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}, python (>= 2.6),
- python-yaml, git, python-cliapp, python-bottle
+ python-yaml, git, python-cliapp, python-jinja2
Description: distributed ticketing system based on git
distix is a distributed ticketing system. It stores the data in git,
using yaml and Maildirs.
diff --git a/distixlib/plugins/show_plugin.py b/distixlib/plugins/show_plugin.py
index 9dc2b23..92ec56b 100644
--- a/distixlib/plugins/show_plugin.py
+++ b/distixlib/plugins/show_plugin.py
@@ -20,7 +20,6 @@ import locale
import os
import uuid
-import bottle
import cliapp
import distixlib