Skip to content

Commit

Permalink
chore: bumps version to v2.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
shortcuts committed Dec 13, 2021
1 parent 1aa719a commit f482b73
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 27 deletions.
42 changes: 21 additions & 21 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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"

This comment has been minimized.

Copy link
@tkrugg

tkrugg Dec 13, 2021

Collaborator

Theses changes look unecessary or accidental. Could you double check?

This comment has been minimized.

Copy link
@shortcuts

shortcuts Dec 13, 2021

Author Member

Indeed... the format on save 🤔 CI still works as expected so it's not a big deal but will push the update

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: /.*/
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion algoliasearch/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION = "2.6.0"
VERSION = "2.6.1"
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = algoliasearch
version = 2.6.0
version = 2.6.1
author = Algolia Team
author_email = [email protected]
maintainer = Algolia Team
Expand Down
4 changes: 2 additions & 2 deletions tests/features/test_search_index.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import unittest
import json
import requests
import mock

from requests.models import Response

Expand All @@ -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

This comment has been minimized.

Copy link
@tkrugg

tkrugg Dec 13, 2021

Collaborator

why not use mock the one in unittest ?

This comment has been minimized.

Copy link
@shortcuts

shortcuts Dec 13, 2021

Author Member

Import was not resolved this way in 2.7, I had to import mock directly to make it work on both versions



class TestSearchIndex(unittest.TestCase):
Expand Down Expand Up @@ -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")

Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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);'

This comment has been minimized.

Copy link
@tkrugg

tkrugg Dec 13, 2021

Collaborator

it's weird that python -c 'print "No asynchronous tests for Python 2.7, skipping." is not exiting with 0 already.
Are you sure exit(0) is necessary?

py{34,35,36}-{sync,async}: python -m unittest discover -v
py{37,38,39}-{sync,async}: python -m unittest discover -v -k {posargs:*}

Expand Down

0 comments on commit f482b73

Please sign in to comment.