Skip to content
This repository has been archived by the owner on Mar 28, 2019. It is now read-only.

Commit

Permalink
Merge pull request #705 from mozilla-services/prepare-3.1.4
Browse files Browse the repository at this point in the history
Preparing release 3.1.4
  • Loading branch information
leplatrem committed May 10, 2016
2 parents 4ca5e76 + 9a528a4 commit c88e677
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Changelog
This document describes changes between each past release.


3.2.0 (unreleased)
3.1.4 (2016-05-10)
------------------

**Bug fixes**
Expand Down
4 changes: 2 additions & 2 deletions cliquet_docs/conf.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
3# -*- coding: utf-8 -*-
#
# Cliquet documentation build configuration file, created by
# sphinx-quickstart on Mon Feb 2 15:08:06 2015.
Expand Down Expand Up @@ -72,7 +72,7 @@ def setup(app):
# The short X.Y version.
version = '3.1'
# The full version, including alpha/beta/rc tags.
release = '3.1.3'
release = '3.1.4'

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
Expand Down
10 changes: 5 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
colander==1.2
colorama==0.3.7
contextlib2==0.5.1
contextlib2==0.5.3
cornice==1.2.1
enum34==1.1.4
enum34==1.1.5
iso8601==0.1.11
newrelic==2.64.0.48
PasteDeploy==1.5.2
Expand All @@ -11,16 +11,16 @@ pyramid==1.6.1
pyramid-multiauth==0.8.0
pyramid-tm==0.12.1
python-dateutil==2.5.3
raven==5.13.0
raven==5.16.0
redis==2.10.5
repoze.lru==0.6
requests==2.9.1
requests==2.10.0
simplejson==3.8.2
six==1.10.0
SQLAlchemy==1.0.12
statsd==3.2.1
structlog==16.0.0
transaction==1.4.4
transaction==1.5.0
translationstring==1.3
ujson==1.35
venusian==1.0
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@


setup(name='cliquet',
version='3.2.0.dev0',
version='3.1.4',
description='Micro service API toolkit',
long_description=README + "\n\n" + CHANGELOG + "\n\n" + CONTRIBUTORS,
license='Apache License (2.0)',
Expand Down

0 comments on commit c88e677

Please sign in to comment.