Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
CHANGES
=======

1.1.0 (unreleased)
1.1.0 (2018-01-03)
------------------

* No changes yet.
* Correct arguments in Tornado - #64
* Removed protocol suffix to fix circus ssl insecure content warning - #69
* Fix add watcher - #70


1.0.0 (2015-06-10)
Expand Down
3 changes: 2 additions & 1 deletion circusweb/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import pkg_resources
import logging

__version__ = '1.1.0.dev0'
__version__ = pkg_resources.get_distribution(__package__).version
logger = logging.getLogger('circus-web')
4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import sys
from setuptools import setup, find_packages
from circusweb import __version__

if not hasattr(sys, 'version_info') or sys.version_info < (2, 6, 0, 'final'):
raise SystemExit("Circus requires Python 2.6 or later.")

Expand All @@ -22,7 +20,7 @@


setup(name='circus-web',
version=__version__,
version='1.1.0',
packages=find_packages(),
description="Circus Web Dashboard",
long_description=README,
Expand Down