Skip to content

Commit

Permalink
Merge branch '0.24' of github.com:dpa-newslab/livebridge into memory-…
Browse files Browse the repository at this point in the history
…leak
  • Loading branch information
mborho committed Jan 26, 2018
2 parents 8a612cb + d1826e5 commit 9bb9cda
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 24 deletions.
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@
# built documents.
#
# The short X.Y version.
version = '0.23'
version = '0.24'
# The full version, including alpha/beta/rc tags.
release = '0.23.0'
release = '0.24.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
22 changes: 11 additions & 11 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
aiobotocore==0.3.3
aiohttp==2.1.0
asynctest==0.10.0
bleach==2.0.0
dsnparse==0.1.4
motor==1.1
pytest==3.1.2
aiobotocore==0.5.2
aiohttp==2.3.9
asynctest==0.11.1
bleach==2.1.2
dsnparse==0.1.11
motor==1.2.1
pytest==3.3.2
pytest-cov==2.5.1
pytest-aiohttp==0.1.3
python-dateutil==2.6.0
pytest-aiohttp==0.3.0
python-dateutil==2.6.1
PyYAML==3.12
Sphinx==1.6.2
Sphinx==1.7.0b1
sqlalchemy-aio==0.11.0
websockets==3.3
websockets==4.0.1
23 changes: 12 additions & 11 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.
from setuptools import setup, find_packages

version = '0.23.0'
version = '0.24.0'

setup(
name='livebridge',
Expand Down Expand Up @@ -44,16 +44,17 @@
include_package_data=True,
zip_safe=False,
install_requires=[
'aiobotocore==0.3.3',
'aiohttp==2.1.0',
'asynctest==0.10.0',
'bleach==2.0.0',
'PyYAML==3.12',
'websockets==3.3',
'sqlalchemy-aio==0.11.0',
'python-dateutil==2.6.0',
'dsnparse==0.1.4',
'motor==1.1',
"aiobotocore==0.5.2",
"aiohttp==2.3.9",
"asynctest==0.11.1",
"bleach==2.1.2",
"dsnparse==0.1.11",
"motor==1.2.1",
"python-dateutil==2.6.1",
"PyYAML==3.12",
"Sphinx==1.7.0b1",
"sqlalchemy-aio==0.11.0",
"websockets==4.0.1",
],
entry_points="""
[console_scripts]
Expand Down

0 comments on commit 9bb9cda

Please sign in to comment.