Merge branch '1.10' into 1.11

fabric · Dec 5, 2016 · 36930d4 · 36930d4
2 parents f4f8106 + 7a64adb
commit 36930d4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
@@ -2,6 +2,7 @@
 Changelog
 =========
 
+* :release:`1.10.5 <2016-12-05>`
 * :bug:`1470` When using `~fabric.operations.get` with glob expressions, a lack
   of matches for the glob would result in an empty file named after the glob
   expression (in addition to raising an error). This has been fixed so the

diff --git a/tasks.py b/tasks.py
@@ -1,13 +1,16 @@
 from invocations.docs import docs, www
-from invocations import packaging
+from invocations.packaging import release
 
 from invoke import Collection
 
 
-ns = Collection(docs, www, release=packaging)
+ns = Collection(docs, www, release)
 ns.configure({
     'packaging': {
         'sign': True,
         'wheel': True,
+        'changelog_file': 'sites/www/changelog.rst',
+        'package': 'fabric',
+        'version_module': 'version',
     },
 })