diff --git a/.travis.yml b/.travis.yml index 97cbfc93d4c1df0cc5ca5053ef57fb58014b40e9..7e506eb4312d9b9b2d1c155899339da3f8eb5493 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ script: - python setup.py test - python -m stress_tests install: - - pip install -r requirements.txt + - python setup.py install - pip install -r stress_tests/requirements.txt - pip install yapf nose2 mock coverage nose2[coverage_plugin] after_success: diff --git a/CHANGELOG.md b/CHANGELOG.md index ac7f447a00488640d8fcca282a1a793a0068e078..4b499fe46252e2d4a4bda3737f58161ce037d2ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.0.2: + +* **bugfix release** due to some bad flags in setup.py it was impossible + to install CoolAMQP on Python 3 + + # v1.0.1: * added support for channel flow control and blocking and diff --git a/MANIFEST.in b/MANIFEST.in index b3603576fce998cd0c8b55118bf4feb145fce465..8ffadb1a866e1b0f8e6cc72d94ee4f011ae6226e 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,3 @@ include LICENSE.md include README.md include CHANGELOG.md -include requirements.txt diff --git a/coolamqp/__init__.py b/coolamqp/__init__.py index 2cecd627e5bcf40780fa1e9dc70f0dbd0d8bbc9f..7e7a5b79d1a423e6c4a859d3b0463efa245ae7e9 100644 --- a/coolamqp/__init__.py +++ b/coolamqp/__init__.py @@ -1,2 +1,2 @@ # coding=UTF-8 -__version__ = '1.0.1' +__version__ = '1.0.2' diff --git a/setup.py b/setup.py index 6847b46e948f424d43ad841ee96ea3215a53db4b..224844ceb073aa95785dc8155c15ba542acbf0cb 100644 --- a/setup.py +++ b/setup.py @@ -7,11 +7,12 @@ from coolamqp import __version__ setup(keywords=['amqp', 'rabbitmq', 'client', 'network', 'ha', 'high availability'], version=__version__, packages=find_packages(include=['coolamqp', 'coolamqp.*']), - install_requires=['six', 'monotonic', 'futures', 'typing'], + install_requires=['six', 'monotonic'], # per coverage version for codeclimate-reporter tests_require=["nose2", "coverage", "nose2[coverage_plugin]"], test_suite='nose2.collector.collector', extras_require={ + ':python_version == "2.7"': ['futures', 'typing'], 'prctl': ['prctl'] } )