From 8d69ab0ef627551a80895aa974b6c95261c7b09c Mon Sep 17 00:00:00 2001 From: Kim Gustyr Date: Mon, 12 Aug 2024 18:40:44 +0100 Subject: [PATCH] chore: single source for release-please release type (#106) * chore: single source for release-please release type * chore: attempt fixing flaky test again * chore: reset changelog to 3.7.0 --- .github/workflows/release-please.yml | 1 - .pre-commit-config.yaml | 2 +- .release-please-manifest.json | 2 +- CHANGELOG.md | 15 ---------- poetry.lock | 41 +--------------------------- pyproject.toml | 1 - tests/test_flagsmith.py | 4 +-- 7 files changed, 5 insertions(+), 61 deletions(-) diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 187026e..968c75b 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -16,4 +16,3 @@ jobs: - uses: googleapis/release-please-action@v4 with: token: ${{ secrets.RELEASE_PLEASE_GITHUB_TOKEN }} - release-type: simple diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c5fb0cb..8e30251 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,7 +5,7 @@ repos: - id: mypy args: [--strict] additional_dependencies: - [freezegun, pydantic, pytest, pytest_mock, types-requests, flagsmith-flag-engine, responses, sseclient-py] + [pydantic, pytest, pytest_mock, types-requests, flagsmith-flag-engine, responses, sseclient-py] - repo: https://github.com/PyCQA/isort rev: 5.13.2 hooks: diff --git a/.release-please-manifest.json b/.release-please-manifest.json index fa4291e..2e30867 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "3.8.0" + ".": "3.7.0" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e055e4..fd90f82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,20 +1,5 @@ # Changelog - - -## [3.8.0](https://github.com/Flagsmith/flagsmith-python-client/compare/v3.7.0...v3.8.0) (2024-08-12) - -### Features - -- Support transient identities and traits ([#93](https://github.com/Flagsmith/flagsmith-python-client/issues/93)) - ([0a11db5](https://github.com/Flagsmith/flagsmith-python-client/commit/0a11db5a1010c177856716e6b90292651fa5889b)) - -### Bug Fixes - -- Offline handler not used as fallback for local evaluation mode during init - ([#100](https://github.com/Flagsmith/flagsmith-python-client/issues/100)) - ([6f6d595](https://github.com/Flagsmith/flagsmith-python-client/commit/6f6d5950bc3a6befd953dc1a24ef497a4a018c7b)) - ## [v3.7.0](https://github.com/Flagsmith/flagsmith-python-client/releases/tag/v3.7.0) - 17 Jul 2024 ### What's Changed diff --git a/poetry.lock b/poetry.lock index 3a67ab0..d317563 100644 --- a/poetry.lock +++ b/poetry.lock @@ -289,20 +289,6 @@ pydantic = ">=2.3.0,<3" pydantic-collections = ">=0.5.1,<1" semver = ">=3.0.1" -[[package]] -name = "freezegun" -version = "1.5.1" -description = "Let your Python tests travel through time" -optional = false -python-versions = ">=3.7" -files = [ - {file = "freezegun-1.5.1-py3-none-any.whl", hash = "sha256:bf111d7138a8abe55ab48a71755673dbaa4ab87f4cff5634a4442dfec34c15f1"}, - {file = "freezegun-1.5.1.tar.gz", hash = "sha256:b29dedfcda6d5e8e083ce71b2b542753ad48cfec44037b3fc79702e2980a89e9"}, -] - -[package.dependencies] -python-dateutil = ">=2.7" - [[package]] name = "identify" version = "2.6.0" @@ -605,20 +591,6 @@ pytest = ">=6.2.5" [package.extras] dev = ["pre-commit", "pytest-asyncio", "tox"] -[[package]] -name = "python-dateutil" -version = "2.9.0.post0" -description = "Extensions to the standard Python datetime module" -optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" -files = [ - {file = "python-dateutil-2.9.0.post0.tar.gz", hash = "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3"}, - {file = "python_dateutil-2.9.0.post0-py2.py3-none-any.whl", hash = "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427"}, -] - -[package.dependencies] -six = ">=1.5" - [[package]] name = "pyyaml" version = "6.0.2" @@ -749,17 +721,6 @@ files = [ {file = "semver-3.0.2.tar.gz", hash = "sha256:6253adb39c70f6e51afed2fa7152bcd414c411286088fb4b9effb133885ab4cc"}, ] -[[package]] -name = "six" -version = "1.16.0" -description = "Python 2 and 3 compatibility utilities" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" -files = [ - {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, - {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, -] - [[package]] name = "sseclient-py" version = "1.8.0" @@ -847,4 +808,4 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess [metadata] lock-version = "2.0" python-versions = ">=3.8.1,<4" -content-hash = "349611a03a029c09eddd68de10599fc1d97fc8ecd826d9fc7f0b5be15ba98c0f" +content-hash = "271e7bd94df6cfdf332704f14a7fe4fab36d58ba7e2d423f0cc242c5b53d91fc" diff --git a/pyproject.toml b/pyproject.toml index 5bc92ce..2dcdeb9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,6 @@ pytest-mock = "^3.6.1" pre-commit = "^2.17.0" responses = "^0.24.1" types-requests = "^2.32" -freezegun = "^1.5.1" [tool.mypy] plugins = ["pydantic.mypy"] diff --git a/tests/test_flagsmith.py b/tests/test_flagsmith.py index 327f0d5..a324427 100644 --- a/tests/test_flagsmith.py +++ b/tests/test_flagsmith.py @@ -3,7 +3,6 @@ import typing import uuid -import freezegun import pytest import requests import responses @@ -528,7 +527,6 @@ def test_flagsmith_uses_offline_handler_if_set_and_no_api_response( @responses.activate() -@freezegun.freeze_time() def test_offline_mode__local_evaluation__correct_fallback( mocker: MockerFixture, environment_model: EnvironmentModel, @@ -539,6 +537,8 @@ def test_offline_mode__local_evaluation__correct_fallback( mock_offline_handler = mocker.MagicMock(spec=BaseOfflineHandler) mock_offline_handler.get_environment.return_value = environment_model + mocker.patch("flagsmith.flagsmith.EnvironmentDataPollingManager") + responses.get(api_url + "environment-document/", status=500) flagsmith = Flagsmith(