Skip to content

Commit

Permalink
Merge pull request #384 from plone/travis-fix
Browse files Browse the repository at this point in the history
Travis fix
  • Loading branch information
tisto committed Jul 24, 2017
2 parents a0fdfa4 + 812ea6c commit 5711d1a
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 14 deletions.
2 changes: 1 addition & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Changelog
=========

1.0a20 (unreleased)
1.0a20 (2017-07-24)
-------------------

Bugfixes:
Expand Down
2 changes: 1 addition & 1 deletion docs/source/_json/tusreplace_post.resp
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion docs/source/_json/tusupload_post.resp
Original file line number Diff line number Diff line change
@@ -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

3 changes: 0 additions & 3 deletions setup.cfg

This file was deleted.

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages

version = '1.0a20.dev0'
version = '1.0a20'

long_description = (
open('README.rst').read() + '\n' +
Expand Down
19 changes: 12 additions & 7 deletions versions.cfg
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 5711d1a

Please sign in to comment.