plone.restapi/plone-only-login: Merge pull request #384 from plone/travis-fix

Repository: plone.restapi
Branch: refs/heads/plone-only-login
Date: 2017-07-24T10:57:25+02:00
Author: Timo Stollenwerk (tisto) <[email protected]>
Commit: https://github.com/plone/plone.restapi/commit/5711d1a3eb794672fd346f3e5b3c7f769cc32af9

Merge pull request #384 from plone/travis-fix

Travis fix

Files changed:
M CHANGES.rst
M docs/source/_json/tusreplace_post.resp
M docs/source/_json/tusupload_post.resp
M setup.py
M versions.cfg
D setup.cfg

diff --git a/CHANGES.rst b/CHANGES.rst
index feedfbb5..f84f297b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-1.0a20 (unreleased)
+1.0a20 (2017-07-24)
 -------------------
 
 Bugfixes:
diff --git a/docs/source/_json/tusreplace_post.resp b/docs/source/_json/tusreplace_post.resp
index 63899237..088f3130 100644
--- a/docs/source/_json/tusreplace_post.resp
+++ b/docs/source/_json/tusreplace_post.resp
@@ -1,4 +1,4 @@
 HTTP/1.1 201 Created
-Location: http://localhost:55001/plone/myfile/@tus-upload/4e465958b24a46ec8657e6f3be720991
 Tus-Resumable: 1.0.0
+Location: http://localhost:55001/plone/myfile/@tus-upload/4e465958b24a46ec8657e6f3be720991
 
diff --git a/docs/source/_json/tusupload_post.resp b/docs/source/_json/tusupload_post.resp
index 1f01bd93..ed4ee518 100644
--- a/docs/source/_json/tusupload_post.resp
+++ b/docs/source/_json/tusupload_post.resp
@@ -1,4 +1,4 @@
 HTTP/1.1 201 Created
-Location: http://localhost:55001/plone/folder/@tus-upload/032803b64ad746b3ab46d9223ea3d90f
 Tus-Resumable: 1.0.0
+Location: http://localhost:55001/plone/folder/@tus-upload/032803b64ad746b3ab46d9223ea3d90f
 
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 46725688..00000000
--- a/setup.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-[templer.local]
-template = plone_basic
-
diff --git a/setup.py b/setup.py
index 7a43e0ac..c0038a6e 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '1.0a20.dev0'
+version = '1.0a20'
 
 long_description = (
     open('README.rst').read() + '\n' +
diff --git a/versions.cfg b/versions.cfg
index aa02abe0..ff9698f2 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -1,24 +1,29 @@
 [versions]
+
 # Build
 setuptools =
 zc.buildout =
 zc.recipe.egg = 2.0.3
 
-pytz = 2017.2
-
-zope.interface = 4.0.5
+# Code-analysis
+plone.recipe.codeanalysis = 2.2
 coverage = 3.7.1
 flake8 = 2.4.0
 flake8-coding = 1.2.2
-plone.recipe.codeanalysis = 2.2
 
+
+# Sphinx
 Sphinx = 1.3.1
 docutils = 0.12
 Pygments = 2.0
 sphinxcontrib-httpexample = 0.5.2
 
-zest.releaser = 6.7
-twine = 1.8.1
-requests = 2.11.1
+# Release
+zest.releaser = 6.12.2
+twine = 1.9.1
+requests = 2.18.1
 
+# Misc
 plone.testing = 4.3.0
+pytz = 2017.2
+zope.interface = 4.0.5



------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot