From a081317bae731c89e3d11dc095076d254177b946 Mon Sep 17 00:00:00 2001 From: Leslie VanDeMark Date: Fri, 19 Jan 2024 19:06:14 +0000 Subject: [PATCH 1/4] test on python 3.11 --- .circleci/config.yml | 7 +++---- setup.py | 8 ++++---- tap_bing_ads/__init__.py | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5f8e36f..45d96f6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ orbs: jobs: build: docker: - - image: 218546966473.dkr.ecr.us-east-1.amazonaws.com/circle-ci:stitch-tap-tester + - image: 218546966473.dkr.ecr.us-east-1.amazonaws.com/circle-ci:stitch-tap-tester-3-11-dev steps: - checkout - run: @@ -24,9 +24,8 @@ jobs: name: 'Unit Tests' command: | source /usr/local/share/virtualenvs/tap-bing-ads/bin/activate - pip install nose coverage - nosetests --with-coverage --cover-erase --cover-package=tap_bing_ads --cover-html-dir=htmlcov tests/unittests - coverage html + pip install nose2 parameterized nose2[coverage_plugin]>=0.6.5 + nose2 --with-coverage -v -s tests/unittests - store_test_results: path: test_output/report.xml - store_artifacts: diff --git a/setup.py b/setup.py index df077d4..f95f621 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setup( name='tap-bing-ads', - version="2.2.0", + version="2.3.0", description='Singer.io tap for extracting data from the Bing Ads API', author='Stitch', url='http://singer.io', @@ -13,10 +13,10 @@ install_requires=[ 'arrow==0.12.0', 'bingads==13.0.11', - 'requests==2.20.0', - 'singer-python==5.9.0', + 'requests==2.31.0', + 'singer-python==6.0.0', 'stringcase==1.2.0', - 'backoff==1.8.0', + 'backoff==2.2.1', ], extras_require={ 'test': [ diff --git a/tap_bing_ads/__init__.py b/tap_bing_ads/__init__.py index 3e60019..7f27d04 100644 --- a/tap_bing_ads/__init__.py +++ b/tap_bing_ads/__init__.py @@ -159,7 +159,7 @@ def create_sdk_client(service, account_id): service, account_id) if CONFIG.get('require_live_connect', 'True') == 'True': - oauth_scope = 'bingads.manage' + oauth_scope = 'msads.manage'#'bingads.manage' else: oauth_scope = 'msads.manage' From 12be54f050e00ca265e42176f7ea5878a77eff09 Mon Sep 17 00:00:00 2001 From: Leslie VanDeMark Date: Fri, 19 Jan 2024 19:11:30 +0000 Subject: [PATCH 2/4] update pip version and add changelog --- .circleci/config.yml | 2 +- CHANGELOG.md | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cd8092f..3884978 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: command: | python3 -mvenv /usr/local/share/virtualenvs/tap-bing-ads source /usr/local/share/virtualenvs/tap-bing-ads/bin/activate - pip install -U 'pip<19.2' 'setuptools<51.0.0' + pip install -U pip 'setuptools<51.0.0' pip install .[test] - run: name: 'pylint' diff --git a/CHANGELOG.md b/CHANGELOG.md index cc9ce08..092c9a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 2.2.1 + *Updates to run on python 3.11.7 [#113](https://github.com/singer-io/tap-bing-ads/pull/113) + ## 2.2.1 * Prefer new authentication scope for the access_token request [#99](https://github.com/singer-io/tap-bing-ads/pull/99) From 71bd35920864224728c38a49838e5beec629188c Mon Sep 17 00:00:00 2001 From: Leslie VanDeMark Date: Fri, 19 Jan 2024 19:15:11 +0000 Subject: [PATCH 3/4] make pylint happy --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3884978..58f90c2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,7 +18,7 @@ jobs: name: 'pylint' command: | source /usr/local/share/virtualenvs/tap-bing-ads/bin/activate - pylint tap_bing_ads -d missing-docstring,line-too-long,invalid-name,super-with-arguments,return-in-init,too-many-arguments,deprecated-method,consider-using-f-string,too-many-lines,unidiomatic-typecheck,consider-using-generator + pylint tap_bing_ads -d missing-docstring,line-too-long,invalid-name,super-with-arguments,return-in-init,too-many-arguments,deprecated-method,consider-using-f-string,too-many-lines,unidiomatic-typecheck,consider-using-generator,broad-exception-raised - run: name: 'Unit Tests' command: | From fe0263bff9d9fa316376888836d70dc605ab0667 Mon Sep 17 00:00:00 2001 From: Leslie VanDeMark Date: Fri, 19 Jan 2024 20:22:47 +0000 Subject: [PATCH 4/4] correct version in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 092c9a7..aadfbda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 2.2.1 +## 2.3.0 *Updates to run on python 3.11.7 [#113](https://github.com/singer-io/tap-bing-ads/pull/113) ## 2.2.1