diff --git a/.circleci/config.yml b/.circleci/config.yml index d9de6c5d8..43102b316 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ jobs: - run: command: sudo pip install --upgrade pip - run: - command: sudo pip install tox + command: sudo pip install tox mock - run: command: tox -e py<< parameters.tox_version >>-sync,py<< parameters.tox_version >>-async @@ -66,54 +66,54 @@ workflows: build: jobs: - test: - name: 'test_27' - docker_version: '2.7' - tox_version: '27' + name: "test_27" + docker_version: "2.7" + tox_version: "27" filters: tags: only: /.*/ - test: - name: 'test_34' - docker_version: '3.4' - tox_version: '34' + name: "test_34" + docker_version: "3.4" + tox_version: "34" filters: tags: only: /.*/ - test: - name: 'test_35' - docker_version: '3.5' - tox_version: '35' + name: "test_35" + docker_version: "3.5" + tox_version: "35" filters: tags: only: /.*/ - test: - name: 'test_36' - docker_version: '3.6' - tox_version: '36' + name: "test_36" + docker_version: "3.6" + tox_version: "36" filters: tags: only: /.*/ - test: - name: 'test_37' - docker_version: '3.7' - tox_version: '37' + name: "test_37" + docker_version: "3.7" + tox_version: "37" filters: tags: only: /.*/ - test: - name: 'test_38' - docker_version: '3.8' - tox_version: '38' + name: "test_38" + docker_version: "3.8" + tox_version: "38" filters: tags: only: /.*/ - format: - name: 'format' + name: "format" filters: tags: only: /.*/ - types: - name: 'types' + name: "types" filters: tags: only: /.*/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d522f824..3238ad6d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/). # Release Notes -## [Unreleased](https://github.com/algolia/algoliasearch-client-python/compare/v2.6.0...master) +## [Unreleased](https://github.com/algolia/algoliasearch-client-python/compare/v2.6.1...master) + +## [v2.6.1](https://github.com/algolia/algoliasearch-client-python/compare/v2.6.0...v2.6.1) + +### Fixed + +- Prevent recursion issue with `browse_rules` method ([#542](https://github.com/algolia/algoliasearch-client-python/pull/542)) ## [v2.6.0](https://github.com/algolia/algoliasearch-client-python/compare/v2.5.0...v2.6.0) diff --git a/algoliasearch/version.py b/algoliasearch/version.py index 840688e3f..f0c101cc7 100644 --- a/algoliasearch/version.py +++ b/algoliasearch/version.py @@ -1 +1 @@ -VERSION = "2.6.0" +VERSION = "2.6.1" diff --git a/setup.cfg b/setup.cfg index 0ab00b3ea..ec323c99e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = algoliasearch -version = 2.6.0 +version = 2.6.1 author = Algolia Team author_email = support@algolia.com maintainer = Algolia Team diff --git a/tests/features/test_search_index.py b/tests/features/test_search_index.py index cec6563ab..315781376 100644 --- a/tests/features/test_search_index.py +++ b/tests/features/test_search_index.py @@ -3,6 +3,7 @@ import unittest import json import requests +import mock from requests.models import Response @@ -12,7 +13,6 @@ from algoliasearch.search_index import SearchIndex from tests.helpers.factory import Factory as F from tests.helpers.misc import Unicode, rule_without_metadata -from unittest.mock import MagicMock class TestSearchIndex(unittest.TestCase): @@ -481,7 +481,7 @@ def side_effect(req, **kwargs): client = SearchClient.create("foo", "bar") client._transporter._requester._session = requests.Session() - client._transporter._requester._session.send = MagicMock(name="send") + client._transporter._requester._session.send = mock.MagicMock(name="send") client._transporter._requester._session.send.side_effect = side_effect index = F.index(client, "test") diff --git a/tox.ini b/tox.ini index 241acddee..a676c8f20 100644 --- a/tox.ini +++ b/tox.ini @@ -39,7 +39,7 @@ passenv = ALGOLIA_ADMIN_KEY_MCM commands = py27-sync: python -m unittest discover -v - py27-async: python -c 'print "No asynchronous tests for Python 2.7, skipping."' + py27-async: python -c 'print "No asynchronous tests for Python 2.7, skipping.";exit(0);' py{34,35,36}-{sync,async}: python -m unittest discover -v py{37,38,39}-{sync,async}: python -m unittest discover -v -k {posargs:*}