From a153c3300cb8d1fa3c59dd9db83bde9cff98ca75 Mon Sep 17 00:00:00 2001 From: Dmitrii Davydov Date: Mon, 1 Sep 2025 12:50:32 +0200 Subject: [PATCH 1/4] Drop future library dependency --- chartmogul/errors.py | 4 +--- setup.py | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/chartmogul/errors.py b/chartmogul/errors.py index 924a82c..55150ce 100644 --- a/chartmogul/errors.py +++ b/chartmogul/errors.py @@ -1,7 +1,5 @@ -from future.utils import raise_from from requests import HTTPError - class ConfigurationError(Exception): pass @@ -20,6 +18,6 @@ class DeprecatedArgumentError(Exception): def annotateHTTPError(err): if isinstance(err, HTTPError): - raise_from(APIError(err.response.content), err) + raise APIError(err.response.content) from err else: raise err diff --git a/setup.py b/setup.py index fc0cf9b..723efec 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -from __future__ import absolute_import import os import re import sys @@ -18,7 +17,6 @@ "uritemplate>=4.1.1", "promise>=2.3.0", "marshmallow>=3.24.0,<5.0.0", - "future>=0.18.3", "urllib3>=2.2.2", ] test_requirements = [ From 584853ca9e4c1e541e236e986e8ac3c82f73b0f5 Mon Sep 17 00:00:00 2001 From: Dmitrii Davydov Date: Mon, 1 Sep 2025 12:50:42 +0200 Subject: [PATCH 2/4] Update library version --- CHANGELOG.md | 6 ++++++ chartmogul/version.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5eca4db..6896ecc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,12 @@ and this project adheres to [Semantic Versioning]. [Keep a Changelog]: https://keepachangelog.com/en/1.0.0/ [Semantic Versioning]: https://semver.org/spec/v2.0.0.html +## [4.6.3] - 2025-09-01 +- Remove future dependency to resolve vulnerability issues + +## [4.6.2] - 2025-07-09 +- Update Marshmallow dependency to use >=3.24.0 + ## [4.6.1] - 2025-05-19 - Fixed Tasks API schema issue - Unify requirements in a single place diff --git a/chartmogul/version.py b/chartmogul/version.py index 456bc7c..de3842d 100644 --- a/chartmogul/version.py +++ b/chartmogul/version.py @@ -1 +1 @@ -__version__ = "4.6.2" +__version__ = "4.6.3" From 4a263c28b79615c49839a75aca4a00bf6da8a6ff Mon Sep 17 00:00:00 2001 From: Dmitrii Davydov Date: Mon, 1 Sep 2025 15:31:54 +0200 Subject: [PATCH 3/4] Remove codeclimate steps from CI --- .github/workflows/test.yml | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6d73f4e..4e8d150 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,32 +50,5 @@ jobs: run: | python -m pip install --upgrade pip setuptools wheel coverage pip install -e .[testing] - - name: Set ENV for codeclimate (pull_request) - continue-on-error: true - run: | - git fetch --no-tags --prune --depth=1 origin +refs/heads/$GITHUB_HEAD_REF:refs/remotes/origin/$GITHUB_HEAD_REF - echo "GIT_BRANCH=$GITHUB_HEAD_REF" >> $GITHUB_ENV - echo "GIT_COMMIT_SHA=$(git rev-parse origin/$GITHUB_HEAD_REF)" >> $GITHUB_ENV - if: github.event_name == 'pull_request' - - name: Set ENV for codeclimate (push) - run: | - echo "GIT_BRANCH=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV - echo "GIT_COMMIT_SHA=$GITHUB_SHA" >> $GITHUB_ENV - if: github.event_name == 'push' - - name: Install Code Climate test report - run: | - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter - chmod +x ./cc-test-reporter - ./cc-test-reporter before-build - name: Run tests - run: coverage run -m unittest && coverage xml -i --include='chartmogul/*' - - name: Send Report to Code Climate - if: ${{ success() }} - env: - CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }} - run: | - if [ -z "$CC_TEST_REPORTER_ID" ]; then - echo "⚠️ Skipping Code Climate upload — CC_TEST_REPORTER_ID is not set." - else - ./cc-test-reporter after-build -t coverage.py - fi + run: coverage run -m unittest && coverage xml -i --include='chartmogul/*' \ No newline at end of file From a27f67222b8b8f04d2bdfb8546d46270ca5d7437 Mon Sep 17 00:00:00 2001 From: Dmitrii Davydov Date: Tue, 2 Sep 2025 10:02:50 +0200 Subject: [PATCH 4/4] Fix python syntax error --- chartmogul/errors.py | 1 + 1 file changed, 1 insertion(+) diff --git a/chartmogul/errors.py b/chartmogul/errors.py index 55150ce..69b4e6d 100644 --- a/chartmogul/errors.py +++ b/chartmogul/errors.py @@ -1,5 +1,6 @@ from requests import HTTPError + class ConfigurationError(Exception): pass