diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7cbc910a05f7d29137e79421fd1902643a59ffb4..3e8791d80fabb962b3d969592581bcca6bcb9f70 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,18 @@ stages: + - test - build +stress_test: + stage: test + services: + - name: rabbitmq:3-management + alias: rabbitmq + before_script: + - python setup.py install + script: + - coverage run --append -m stress_tests + - coverage report + pages: image: zoo.smok.co/build/build:latest stage: build diff --git a/CHANGELOG.md b/CHANGELOG.md index 3437589f443826d4693dbc26b7c21ee88f2a5a8d..5423a09dff05d7ed46872154793693db2a50e4a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,4 +4,4 @@ have been made so far, between releases. # v1.3.2 -* _TBA_ \ No newline at end of file +* removed the requirement for a Queue that for it to be equal to other Queue if their types do match \ No newline at end of file diff --git a/README.md b/README.md index 47a44f2d8db0cc17f316efa7bab62f3cc80681fb..0160f4f6fa93c4ab6fc04f16332bd38e2b0662ac 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,22 @@ CoolAMQP ======== -[](https://codeclimate.com/github/smok-serwis/coolamqp/coverage) -[](https://codeclimate.com/github/smok-serwis/coolamqp) -[](https://codeclimate.com/github/smok-serwis/coolamqp) -[](https://badge.fury.io/py/CoolAMQP) -[]() -[]() -[]() -[](http://coolamqp.readthedocs.io/en/latest/?badge=develop) +[](http://smokserwis.docs.smok5.co/coolamqp) []() +**Warning!!** Since v1.3.1 development has been moved to this GitLab. +To install CoolAMQP please use + +```bash +pip install --extra-index-url https://git.dms-serwis.com.pl/api/v4/groups/330/-/packages/pypi/simple coolamqp +``` + +Or state it at the beginning of your `requirements.txt`: + +```python +--extra-index-url https://git.dms-serwis.com.pl/api/v4/groups/330/-/packages/pypi/simple +coolamqp +``` + Why CoolAMQP? ------------- diff --git a/coolamqp/__init__.py b/coolamqp/__init__.py index 4efac1c94f1d1963ee702f120d885b56cb4567a6..c7d8778d6952a2ec555b4f80d08bbbb7388e588e 100644 --- a/coolamqp/__init__.py +++ b/coolamqp/__init__.py @@ -1 +1 @@ -__version__ = '1.3.2a1' +__version__ = '1.3.2a2' diff --git a/coolamqp/objects.py b/coolamqp/objects.py index 69a1045f0679d1f51a625b81d087785e1e2d287e..e505920eb357a9a82266f221a20f7e1b1feeb5f2 100644 --- a/coolamqp/objects.py +++ b/coolamqp/objects.py @@ -251,7 +251,7 @@ class Queue(object): assert isinstance(self.consumer_tag, six.binary_type) def __eq__(self, other): - return (self.name == other.name) and (type(self) == type(other)) + return self.name == other.name def __hash__(self): return hash(self.name) diff --git a/stress_tests/settings.py b/stress_tests/settings.py index 57424f46db7fd4210245eaa1d3915d217fa2cc86..8e2badfa1ef5c8463f7e6aa748736aef3ad69afe 100644 --- a/stress_tests/settings.py +++ b/stress_tests/settings.py @@ -6,7 +6,7 @@ from coolamqp.objects import NodeDefinition logger = logging.getLogger(__name__) -NODE = NodeDefinition(os.environ.get('AMQP_HOST', '127.0.0.1'), 'guest', 'guest', heartbeat=20) +NODE = NodeDefinition(os.environ.get('AMQP_HOST', 'rabbitmq'), 'guest', 'guest', heartbeat=20) logging.basicConfig(level=logging.DEBUG)