Skip to content

Commit f99577e

Browse files
creihtTarmac
authored andcommitted
Bump version up to 1.1.0, and updated AUTHORS file
2 parents 2f14103 + 06b791a commit f99577e

File tree

5 files changed

+17
-8
lines changed

5 files changed

+17
-8
lines changed

AUTHORS

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@ Chuck Thier
1616
Contributors
1717
------------
1818
Chmouel Boudjnah
19+
Anne Gentle
20+
Clay Gerrard
21+
David Goetz
22+
Soren Hansen
23+
Paul Jimenez
24+
Brian K. Jones
1925
Ed Leafe
20-
Conrad Weidenkeller
26+
Andrew Clay Shafer
2127
Monty Taylor
28+
Caleb Tennis
29+
Kapil Thangavelu
30+
Conrad Weidenkeller
31+
Cory Wright

doc/source/conf.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,10 @@
6161
# built documents.
6262
#
6363
# The short X.Y version.
64-
version = '1.0'
64+
from swift import __version__
65+
version = __version__.rsplit('.', 1)[0]
6566
# The full version, including alpha/beta/rc tags.
66-
release = '1.0.2'
67+
release = __version__
6768

6869
# The language for content autogenerated by Sphinx. Refer to documentation
6970
# for a list of supported languages.

doc/source/debian_package_guide.rst

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,7 @@ Instructions for Building Debian Packages for Swift
5858
apt-get install python-software-properties
5959
add-apt-repository ppa:swift-core/ppa
6060
apt-get update
61-
apt-get install curl gcc bzr python-configobj python-coverage python-dev
62-
python-nose python-setuptools python-simplejson python-xattr
63-
python-webob python-eventlet python-greenlet debhelper python-sphinx
64-
python-all python-openssl python-pastedeploy
61+
apt-get install curl gcc bzr python-configobj python-coverage python-dev python-nose python-setuptools python-simplejson python-xattr python-webob python-eventlet python-greenlet debhelper python-sphinx python-all python-openssl python-pastedeploy bzr-builddeb
6562

6663
* As you
6764

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import os
2020
import subprocess
2121

22+
from swift import __version__ as version
2223

2324
class local_sdist(sdist):
2425
"""Customized sdist hook - builds the ChangeLog file from VC first"""
@@ -36,7 +37,6 @@ def run(self):
3637

3738

3839
name = 'swift'
39-
version = '1.0.2'
4040

4141
setup(
4242
name=name,

swift/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
__version__ = '1.1.0'

0 commit comments

Comments
 (0)