Merge branch 'fix-0.9.1'

denshoproject · Sep 22, 2014 · 28809e9 · 28809e9
2 parents bc9f8a7 + c763660
commit 28809e9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/ddr/DDR/__init__.py b/ddr/DDR/__init__.py
@@ -1,4 +1,4 @@
-VERSION = '0.9-beta'
+VERSION = '0.9.1-beta'
 CONFIG_FILES = ['/etc/ddr/ddr.cfg', '/etc/ddr/local.cfg']
 
 class NoConfigError(Exception):

diff --git a/ddr/requirements/_base.txt b/ddr/requirements/_base.txt
@@ -3,14 +3,14 @@
 # Non-Python dependencies
 # sudo apt-get install imagemagick libexempi3 libxml2-dev python-dev pmount udisks
 
-                    # LICENSE   DEBIAN PKG (WHEEZY)              (JESSIE)                       Python3
+                          # LICENSE   DEBIAN PKG (WHEEZY)              (JESSIE)                       Python3
 
-beautifulsoup4      # MIT       python-beautifulsoup (3.2.1-1)   python-beautifulsoup (3.2.1-1) y
-python-dateutil     # BSD       python-dateutil (1.5+dfsg-0.1)   python-dateutil (1.5+dfsg-1)   y
-elasticsearch       # Apache    n/a                              n/a                            y
-envoy               # MIT       n/a                              n/a                            y
-GitPython           # BSD       python-git (0.3.2~RC1-1)         python-git (0.3.2~RC1-3)       NO
-python-xmp-toolkit  # New BSD   n/a                              (sid) python-libxmp (v?)       y
-lxml                # BSD       python-lxml (2.3.2-1+deb7u1)     python-lxml (3.3.5-1+b1)       y
-pytz                # MIT       python-tz (2012c-1)              python-tz (2012c-1)            y
-requests            # Apache    python-requests (0.12.1-1)       python-requests (2.3.0-1)      y
+beautifulsoup4==4.3.2     # MIT       python-beautifulsoup (3.2.1-1)   python-beautifulsoup (3.2.1-1) y
+python-dateutil==2.2      # BSD       python-dateutil (1.5+dfsg-0.1)   python-dateutil (1.5+dfsg-1)   y
+elasticsearch==1.2.0      # Apache    n/a                              n/a                            y
+envoy==0.0.3              # MIT       n/a                              n/a                            y
+GitPython==0.3.2.RC1      # BSD       python-git (0.3.2~RC1-1)         python-git (0.3.2~RC1-3)       NO
+python-xmp-toolkit==2.0.1 # New BSD   n/a                              (sid) python-libxmp (v?)       y
+lxml==3.3.5               # BSD       python-lxml (2.3.2-1+deb7u1)     python-lxml (3.3.5-1+b1)       y
+pytz==2014.4              # MIT       python-tz (2012c-1)              python-tz (2012c-1)            y
+requests==2.3.0           # Apache    python-requests (0.12.1-1)       python-requests (2.3.0-1)      y