From 556dcc1aa11b9fefcfc7f454599bf6f8ac6a992f Mon Sep 17 00:00:00 2001 From: GSVarsha <52667690+GSVarsha@users.noreply.github.com> Date: Fri, 21 Jul 2023 18:51:27 +0530 Subject: [PATCH 01/15] Update config.yml to test tornado --- .circleci/config.yml | 139 ++----------------------------------------- 1 file changed, 6 insertions(+), 133 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1d8d784c..d2cc7d43 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -74,86 +74,13 @@ commands: path: htmlcov jobs: - python37: - docker: - - image: cimg/python:3.7.17 - - image: cimg/postgres:9.6.24 - environment: - POSTGRES_USER: root - POSTGRES_PASSWORD: '' - POSTGRES_DB: circle_test - - image: cimg/mariadb:10.11.2 - - image: cimg/redis:5.0.14 - - image: rabbitmq:3.9.13 - - image: mongo:4.2.3 - - image: singularities/pubsub-emulator - environment: - PUBSUB_PROJECT_ID: "project-test" - PUBSUB_LISTEN_ADDRESS: "0.0.0.0:8432" - working_directory: ~/repo - steps: - - checkout - - pip-install-deps: - requirements: "tests/requirements-307.txt" - - run-tests-with-coverage-report - - store-pytest-results - - store-coverage-report - - python38: - docker: - - image: cimg/python:3.8.17 - - image: cimg/postgres:9.6.24 - environment: - POSTGRES_USER: root - POSTGRES_PASSWORD: '' - POSTGRES_DB: circle_test - - image: cimg/mariadb:10.11.2 - - image: cimg/redis:5.0.14 - - image: rabbitmq:3.9.13 - - image: mongo:4.2.3 - - image: singularities/pubsub-emulator - environment: - PUBSUB_PROJECT_ID: "project-test" - PUBSUB_LISTEN_ADDRESS: "0.0.0.0:8432" - working_directory: ~/repo - steps: - - checkout - - pip-install-deps - - run-tests-with-coverage-report - - store-pytest-results - - store-coverage-report - - python39: - docker: - - image: cimg/python:3.9.17 - - image: cimg/postgres:9.6.24 - environment: - POSTGRES_USER: root - POSTGRES_PASSWORD: '' - POSTGRES_DB: circle_test - - image: cimg/mariadb:10.11.2 - - image: cimg/redis:5.0.14 - - image: rabbitmq:3.9.13 - - image: mongo:4.2.3 - - image: singularities/pubsub-emulator - environment: - PUBSUB_PROJECT_ID: "project-test" - PUBSUB_LISTEN_ADDRESS: "0.0.0.0:8432" - working_directory: ~/repo - steps: - - checkout - - pip-install-deps - - run-tests-with-coverage-report - - store-pytest-results - - store-coverage-report - python310: docker: - image: cimg/python:3.10.12 - image: cimg/postgres:9.6.24 environment: POSTGRES_USER: root - POSTGRES_PASSWORD: '' + POSTGRES_PASSWORD: "" POSTGRES_DB: circle_test - image: cimg/mariadb:10.11.2 - image: cimg/redis:5.0.14 @@ -172,13 +99,13 @@ jobs: - store-pytest-results - store-coverage-report - python311: + py310tornado: docker: - - image: cimg/python:3.11.4 + - image: cimg/python:3.10.12 - image: cimg/postgres:9.6.24 environment: POSTGRES_USER: root - POSTGRES_PASSWORD: '' + POSTGRES_PASSWORD: "" POSTGRES_DB: circle_test - image: cimg/mariadb:10.11.2 - image: cimg/redis:5.0.14 @@ -192,68 +119,14 @@ jobs: steps: - checkout - pip-install-deps: - requirements: "tests/requirements-310.txt" + requirements: "tests/requirements-310-with-tornado.txt" - run-tests-with-coverage-report - store-pytest-results - store-coverage-report - py38couchbase: - docker: - - image: cimg/python:3.8.17 - - image: couchbase/server-sandbox:5.5.0 - working_directory: ~/repo - steps: - - checkout - - install-couchbase-deps - - pip-install-deps: - requirements: "tests/requirements-couchbase.txt" - - run-tests-with-coverage-report: - couchbase: "true" - tests: "tests/clients/test_couchbase.py" - - store-pytest-results - - store-coverage-report - - py37cassandra: - docker: - - image: cimg/python:3.7.17 - - image: cassandra:3.11 - environment: - MAX_HEAP_SIZE: 2048m - HEAP_NEWSIZE: 512m - working_directory: ~/repo - steps: - - checkout - - pip-install-deps: - requirements: "tests/requirements-cassandra.txt" - - run-tests-with-coverage-report: - cassandra: "true" - tests: "tests/clients/test_cassandra-driver.py" - - store-pytest-results - - store-coverage-report - - py38gevent: - docker: - - image: cimg/python:3.8.17 - working_directory: ~/repo - steps: - - checkout - - pip-install-deps: - requirements: "tests/requirements-gevent.txt" - - run-tests-with-coverage-report: - gevent: "true" - tests: "tests/frameworks/test_gevent.py" - - store-pytest-results - - store-coverage-report - workflows: version: 2 build: jobs: - - python37 - - python38 - - python39 - python310 - - python311 - - py37cassandra - - py38couchbase - - py38gevent + - py310tornado From e045d87213584c633887dece5f76347fbaa32edb Mon Sep 17 00:00:00 2001 From: GSVarsha <52667690+GSVarsha@users.noreply.github.com> Date: Fri, 21 Jul 2023 20:05:39 +0530 Subject: [PATCH 02/15] Update config.yml to include tornado_client --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d2cc7d43..df9679f3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -59,7 +59,7 @@ commands: GEVENT_TEST: "<>" command: | . venv/bin/activate - coverage run --source=instana -m pytest -v --junitxml=test-results <> + coverage run --source=instana -m pytest -v --junitxml=test-results tests/frameworks/test_tornado_client.py coverage report -m coverage html From 1a39db90b7ccbac0b7a8154a6cf78da81fd498d3 Mon Sep 17 00:00:00 2001 From: GSVarsha <52667690+GSVarsha@users.noreply.github.com> Date: Fri, 21 Jul 2023 20:10:02 +0530 Subject: [PATCH 03/15] Update test_tornado_client.py --- tests/frameworks/test_tornado_client.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/frameworks/test_tornado_client.py b/tests/frameworks/test_tornado_client.py index 80df0cef..e013d592 100644 --- a/tests/frameworks/test_tornado_client.py +++ b/tests/frameworks/test_tornado_client.py @@ -14,8 +14,8 @@ import tests.apps.tornado_server from ..helpers import testenv -from nose.plugins.skip import SkipTest -raise SkipTest("Non deterministic tests TBR") +# from nose.plugins.skip import SkipTest +# raise SkipTest("Non deterministic tests TBR") class TestTornadoClient(unittest.TestCase): From 71942d53d1381544f0b23ab3df43108a8f69f60c Mon Sep 17 00:00:00 2001 From: GSVarsha <52667690+GSVarsha@users.noreply.github.com> Date: Fri, 21 Jul 2023 20:13:56 +0530 Subject: [PATCH 04/15] Update requirements-310-with-tornado.txt --- tests/requirements-310-with-tornado.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements-310-with-tornado.txt b/tests/requirements-310-with-tornado.txt index 111b2cf3..8ec01766 100644 --- a/tests/requirements-310-with-tornado.txt +++ b/tests/requirements-310-with-tornado.txt @@ -4,7 +4,7 @@ # AttributeError: module 'collections' has no attribute 'MutableMapping' # An alternative would be to disable this in testconf: # collect_ignore_glob.append("*test_tornado*") -tornado>=6.1 +tornado==6.2 aiofiles>=0.5.0 aiohttp>=3.8.3 boto3>=1.17.74 From 506ba0fc3b72da4520292bb370285087a6e17f68 Mon Sep 17 00:00:00 2001 From: GSVarsha <52667690+GSVarsha@users.noreply.github.com> Date: Fri, 21 Jul 2023 20:15:06 +0530 Subject: [PATCH 05/15] Update config.yml --- .circleci/config.yml | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index df9679f3..deb672a4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -74,31 +74,6 @@ commands: path: htmlcov jobs: - python310: - docker: - - image: cimg/python:3.10.12 - - image: cimg/postgres:9.6.24 - environment: - POSTGRES_USER: root - POSTGRES_PASSWORD: "" - POSTGRES_DB: circle_test - - image: cimg/mariadb:10.11.2 - - image: cimg/redis:5.0.14 - - image: rabbitmq:3.9.13 - - image: mongo:4.2.3 - - image: singularities/pubsub-emulator - environment: - PUBSUB_PROJECT_ID: "project-test" - PUBSUB_LISTEN_ADDRESS: "0.0.0.0:8432" - working_directory: ~/repo - steps: - - checkout - - pip-install-deps: - requirements: "tests/requirements-310.txt" - - run-tests-with-coverage-report - - store-pytest-results - - store-coverage-report - py310tornado: docker: - image: cimg/python:3.10.12 From 3c5d1134862ed1d27b8f53cc8dc2a12ed7878483 Mon Sep 17 00:00:00 2001 From: Varsha GS Date: Sat, 5 Aug 2023 11:32:19 +0530 Subject: [PATCH 06/15] add depandabot.yml --- .github/dependabot.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..f79241b2 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,25 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + - package-ecosystem: "pip" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "daily" + time: "11:39" + groups: + python-packages: + patterns: + - "*" + - package-ecosystem: "pip" # See documentation for possible values + directory: "/tests" # Location of package manifests + schedule: + interval: "daily" + time: "11:39" + groups: + python-packages: + patterns: + - "*" From c0725da1ac7971c5b7884944051fcf4f28c85f24 Mon Sep 17 00:00:00 2001 From: Varsha GS Date: Sat, 5 Aug 2023 11:49:17 +0530 Subject: [PATCH 07/15] dependabot fixes --- .github/dependabot.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f79241b2..3fb0a7a3 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,17 +9,8 @@ updates: directory: "/" # Location of package manifests schedule: interval: "daily" - time: "11:39" + time: "11:50" groups: python-packages: patterns: - - "*" - - package-ecosystem: "pip" # See documentation for possible values - directory: "/tests" # Location of package manifests - schedule: - interval: "daily" - time: "11:39" - groups: - python-packages: - patterns: - - "*" + - "*" \ No newline at end of file From 091592df4c98be25add40d4b5ad9b8012e3949df Mon Sep 17 00:00:00 2001 From: Varsha GS Date: Sat, 5 Aug 2023 12:00:14 +0530 Subject: [PATCH 08/15] circleci test changes --- .circleci/config.yml | 182 ++++++++++++++++++++++++++++++++++++++++- .github/dependabot.yml | 2 +- 2 files changed, 181 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index deb672a4..1053ab3f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -59,7 +59,7 @@ commands: GEVENT_TEST: "<>" command: | . venv/bin/activate - coverage run --source=instana -m pytest -v --junitxml=test-results tests/frameworks/test_tornado_client.py + coverage run --source=instana -m pytest -v --junitxml=test-results <> coverage report -m coverage html @@ -74,6 +74,177 @@ commands: path: htmlcov jobs: + python37: + docker: + - image: cimg/python:3.7.17 + - image: cimg/postgres:9.6.24 + environment: + POSTGRES_USER: root + POSTGRES_PASSWORD: '' + POSTGRES_DB: circle_test + - image: cimg/mariadb:10.11.2 + - image: cimg/redis:5.0.14 + - image: rabbitmq:3.9.13 + - image: mongo:4.2.3 + - image: singularities/pubsub-emulator + environment: + PUBSUB_PROJECT_ID: "project-test" + PUBSUB_LISTEN_ADDRESS: "0.0.0.0:8432" + working_directory: ~/repo + steps: + - checkout + - pip-install-deps: + requirements: "tests/requirements-307.txt" + - run-tests-with-coverage-report + - store-pytest-results + - store-coverage-report + + python38: + docker: + - image: cimg/python:3.8.17 + - image: cimg/postgres:9.6.24 + environment: + POSTGRES_USER: root + POSTGRES_PASSWORD: '' + POSTGRES_DB: circle_test + - image: cimg/mariadb:10.11.2 + - image: cimg/redis:5.0.14 + - image: rabbitmq:3.9.13 + - image: mongo:4.2.3 + - image: singularities/pubsub-emulator + environment: + PUBSUB_PROJECT_ID: "project-test" + PUBSUB_LISTEN_ADDRESS: "0.0.0.0:8432" + working_directory: ~/repo + steps: + - checkout + - pip-install-deps + - run-tests-with-coverage-report + - store-pytest-results + - store-coverage-report + + python39: + docker: + - image: cimg/python:3.9.17 + - image: cimg/postgres:9.6.24 + environment: + POSTGRES_USER: root + POSTGRES_PASSWORD: '' + POSTGRES_DB: circle_test + - image: cimg/mariadb:10.11.2 + - image: cimg/redis:5.0.14 + - image: rabbitmq:3.9.13 + - image: mongo:4.2.3 + - image: singularities/pubsub-emulator + environment: + PUBSUB_PROJECT_ID: "project-test" + PUBSUB_LISTEN_ADDRESS: "0.0.0.0:8432" + working_directory: ~/repo + steps: + - checkout + - pip-install-deps + - run-tests-with-coverage-report + - store-pytest-results + - store-coverage-report + + python310: + docker: + - image: cimg/python:3.10.12 + - image: cimg/postgres:9.6.24 + environment: + POSTGRES_USER: root + POSTGRES_PASSWORD: '' + POSTGRES_DB: circle_test + - image: cimg/mariadb:10.11.2 + - image: cimg/redis:5.0.14 + - image: rabbitmq:3.9.13 + - image: mongo:4.2.3 + - image: singularities/pubsub-emulator + environment: + PUBSUB_PROJECT_ID: "project-test" + PUBSUB_LISTEN_ADDRESS: "0.0.0.0:8432" + working_directory: ~/repo + steps: + - checkout + - pip-install-deps: + requirements: "tests/requirements-310.txt" + - run-tests-with-coverage-report + - store-pytest-results + - store-coverage-report + + python311: + docker: + - image: cimg/python:3.11.4 + - image: cimg/postgres:9.6.24 + environment: + POSTGRES_USER: root + POSTGRES_PASSWORD: '' + POSTGRES_DB: circle_test + - image: cimg/mariadb:10.11.2 + - image: cimg/redis:5.0.14 + - image: rabbitmq:3.9.13 + - image: mongo:4.2.3 + - image: singularities/pubsub-emulator + environment: + PUBSUB_PROJECT_ID: "project-test" + PUBSUB_LISTEN_ADDRESS: "0.0.0.0:8432" + working_directory: ~/repo + steps: + - checkout + - pip-install-deps: + requirements: "tests/requirements-310.txt" + - run-tests-with-coverage-report + - store-pytest-results + - store-coverage-report + + py38couchbase: + docker: + - image: cimg/python:3.8.17 + - image: couchbase/server-sandbox:5.5.0 + working_directory: ~/repo + steps: + - checkout + - install-couchbase-deps + - pip-install-deps: + requirements: "tests/requirements-couchbase.txt" + - run-tests-with-coverage-report: + couchbase: "true" + tests: "tests/clients/test_couchbase.py" + - store-pytest-results + - store-coverage-report + + py37cassandra: + docker: + - image: cimg/python:3.7.17 + - image: cassandra:3.11 + environment: + MAX_HEAP_SIZE: 2048m + HEAP_NEWSIZE: 512m + working_directory: ~/repo + steps: + - checkout + - pip-install-deps: + requirements: "tests/requirements-cassandra.txt" + - run-tests-with-coverage-report: + cassandra: "true" + tests: "tests/clients/test_cassandra-driver.py" + - store-pytest-results + - store-coverage-report + + py38gevent: + docker: + - image: cimg/python:3.8.17 + working_directory: ~/repo + steps: + - checkout + - pip-install-deps: + requirements: "tests/requirements-gevent.txt" + - run-tests-with-coverage-report: + gevent: "true" + tests: "tests/frameworks/test_gevent.py" + - store-pytest-results + - store-coverage-report + py310tornado: docker: - image: cimg/python:3.10.12 @@ -103,5 +274,12 @@ workflows: version: 2 build: jobs: + - python37 + - python38 + - python39 - python310 - - py310tornado + - python311 + - py37cassandra + - py38couchbase + - py38gevent + - py310tornado \ No newline at end of file diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3fb0a7a3..6f65c201 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,7 +9,7 @@ updates: directory: "/" # Location of package manifests schedule: interval: "daily" - time: "11:50" + time: "12:03" groups: python-packages: patterns: From 0ee0febb16cfaf4533a90df754c6f4928cbc8eb0 Mon Sep 17 00:00:00 2001 From: Varsha GS Date: Sat, 5 Aug 2023 12:12:29 +0530 Subject: [PATCH 09/15] skip tornado_client tests as usual --- tests/frameworks/test_tornado_client.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/frameworks/test_tornado_client.py b/tests/frameworks/test_tornado_client.py index e013d592..80df0cef 100644 --- a/tests/frameworks/test_tornado_client.py +++ b/tests/frameworks/test_tornado_client.py @@ -14,8 +14,8 @@ import tests.apps.tornado_server from ..helpers import testenv -# from nose.plugins.skip import SkipTest -# raise SkipTest("Non deterministic tests TBR") +from nose.plugins.skip import SkipTest +raise SkipTest("Non deterministic tests TBR") class TestTornadoClient(unittest.TestCase): From 402db693624ef1f7642626f03b464f1d067fe898 Mon Sep 17 00:00:00 2001 From: Varsha GS Date: Tue, 8 Aug 2023 18:25:41 +0530 Subject: [PATCH 10/15] create new requirements file from supported doc --- .github/dependabot.yml | 4 ++-- test-requirements/test-requirements.txt | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 test-requirements/test-requirements.txt diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6f65c201..1d29c92a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,10 +6,10 @@ version: 2 updates: - package-ecosystem: "pip" # See documentation for possible values - directory: "/" # Location of package manifests + directory: "/test-requirements" # Location of package manifests schedule: interval: "daily" - time: "12:03" + time: "18:30" groups: python-packages: patterns: diff --git a/test-requirements/test-requirements.txt b/test-requirements/test-requirements.txt new file mode 100644 index 00000000..1a55c08b --- /dev/null +++ b/test-requirements/test-requirements.txt @@ -0,0 +1,23 @@ +Celery >= 5.3.1 +Django >= 4.2.4 +FastAPI >= 0.101.0 +Flask >= 2.3.2 +Pyramid >= 2.0.1 +Sanic <= 21.6.2 +Starlette <0.28.0,>=0.27.0 +Tornado <= 6.2 +Aiohttp >= 3.8.5 +Boto3 >= 1.28.20 +Google-cloud-pubsub >= 2.18.1 +Google-cloud-storage >= 2.10.0 +Grpcio >= 1.56.2 +Mysqlclient >= 2.2.0 +Pika >= 1.3.2 +PyMySQL >= 1.1.0 +Pymongo >= 4.4.1 +Psycopg2 >= 2.9.7 +Redis >= 4.6.0 +Requests >= 2.31.0 +SQLAlchemy >= 2.0.19 +Urllib3 >= 2.0.4 +Gevent >= 23.7.0 \ No newline at end of file From 76d074f23b11253df9eb84e194b50ed231638c69 Mon Sep 17 00:00:00 2001 From: Varsha GS Date: Tue, 8 Aug 2023 19:02:30 +0530 Subject: [PATCH 11/15] ignoring certain dependencies from dependabot --- .github/dependabot.yml | 20 +++++++++-- test-requirements/test-requirements.txt | 44 ++++++++++++------------- 2 files changed, 40 insertions(+), 24 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 1d29c92a..4dfb5438 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,11 +6,27 @@ version: 2 updates: - package-ecosystem: "pip" # See documentation for possible values - directory: "/test-requirements" # Location of package manifests + directory: "/" # Location of package manifests schedule: interval: "daily" time: "18:30" groups: python-packages: patterns: - - "*" \ No newline at end of file + - "*" + ignore: + - dependency-name: "tornado" + # The tornado issue partially recorded in the Kanbanize ticket: + # https://instana.kanbanize.com/ctrl_board/197/cards/135147/details/, and there is an AHA Idea about it. + - dependency-name: "google-cloud-pubsub" + # google-cloud-pubsub (Collecting google-cloud-pubsub<=2.1.0 (from -r tests/requirements-310.txt (line 11))) + - dependency-name: "sanic" + # The lagging of the Sanic version is a known issue for at least a year, the oldest ticket is on the archived board: + # https://instana.kanbanize.com/ctrl_board/49/cards/102939/details/ + # which is referenced from a ticket on our current board: + # https://instana.kanbanize.com/ctrl_board/197/cards/109698/details/ + - dependency-name: "urllib3" + # urllib3 (Collecting urllib3<1.27,>=1.26.5 (from instana==2.0.5->-r requirements.txt (line 2))) + - dependency-name: "couchbase" + - dependency-name: "protobuf" + \ No newline at end of file diff --git a/test-requirements/test-requirements.txt b/test-requirements/test-requirements.txt index 1a55c08b..00633522 100644 --- a/test-requirements/test-requirements.txt +++ b/test-requirements/test-requirements.txt @@ -1,23 +1,23 @@ -Celery >= 5.3.1 -Django >= 4.2.4 -FastAPI >= 0.101.0 -Flask >= 2.3.2 -Pyramid >= 2.0.1 -Sanic <= 21.6.2 +# Celery <= 5.3.1 +# Django <= 4.2.4 +# FastAPI <= 0.101.0 +# Flask <= 2.3.2 +# Pyramid <= 2.0.1 +# Sanic <= 21.6.2 Starlette <0.28.0,>=0.27.0 -Tornado <= 6.2 -Aiohttp >= 3.8.5 -Boto3 >= 1.28.20 -Google-cloud-pubsub >= 2.18.1 -Google-cloud-storage >= 2.10.0 -Grpcio >= 1.56.2 -Mysqlclient >= 2.2.0 -Pika >= 1.3.2 -PyMySQL >= 1.1.0 -Pymongo >= 4.4.1 -Psycopg2 >= 2.9.7 -Redis >= 4.6.0 -Requests >= 2.31.0 -SQLAlchemy >= 2.0.19 -Urllib3 >= 2.0.4 -Gevent >= 23.7.0 \ No newline at end of file +# Tornado <= 6.2 +# Aiohttp <= 3.8.5 +# Boto3 <= 1.28.20 +# Google-cloud-pubsub <= 2.18.1 +# Google-cloud-storage <= 2.10.0 +# Grpcio <= 1.56.2 +# Mysqlclient <= 2.2.0 +# Pika <= 1.3.2 +# PyMySQL <= 1.1.0 +# Pymongo <= 4.4.1 +# Psycopg2 <= 2.9.7 +# Redis <= 4.6.0 +# Requests <= 2.31.0 +# SQLAlchemy <= 2.0.19 +# Urllib3 <= 2.0.4 +# Gevent <= 23.7.0 \ No newline at end of file From 54d7ffefa122c3c243bf611374242454cedcde64 Mon Sep 17 00:00:00 2001 From: Varsha GS Date: Wed, 9 Aug 2023 15:01:19 +0530 Subject: [PATCH 12/15] try versioning-strategy --- .github/dependabot.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4dfb5438..23315946 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -14,6 +14,7 @@ updates: python-packages: patterns: - "*" + versioning-strategy: increase ignore: - dependency-name: "tornado" # The tornado issue partially recorded in the Kanbanize ticket: @@ -29,4 +30,5 @@ updates: # urllib3 (Collecting urllib3<1.27,>=1.26.5 (from instana==2.0.5->-r requirements.txt (line 2))) - dependency-name: "couchbase" - dependency-name: "protobuf" - \ No newline at end of file + - dependency-name: "importlib-metadata" + # fails for python-3.7 \ No newline at end of file From 3e9314774b83cbfeac844390b3cf1653df0a70ff Mon Sep 17 00:00:00 2001 From: Varsha GS Date: Wed, 9 Aug 2023 15:28:03 +0530 Subject: [PATCH 13/15] use widen strategy --- .github/dependabot.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 23315946..6d88580f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -14,7 +14,7 @@ updates: python-packages: patterns: - "*" - versioning-strategy: increase + versioning-strategy: widen ignore: - dependency-name: "tornado" # The tornado issue partially recorded in the Kanbanize ticket: @@ -28,7 +28,9 @@ updates: # https://instana.kanbanize.com/ctrl_board/197/cards/109698/details/ - dependency-name: "urllib3" # urllib3 (Collecting urllib3<1.27,>=1.26.5 (from instana==2.0.5->-r requirements.txt (line 2))) - - dependency-name: "couchbase" + - dependency-name: "starlette" + # starlette (Collecting starlette<0.28.0,>=0.27.0 (from fastapi>=0.92.0->-r tests/requirements-310.txt (line 7)) + #- dependency-name: "couchbase" - dependency-name: "protobuf" - dependency-name: "importlib-metadata" # fails for python-3.7 \ No newline at end of file From 84bbddeeddb4077f6d575477aae39319b4591198 Mon Sep 17 00:00:00 2001 From: Varsha GS Date: Wed, 9 Aug 2023 15:30:43 +0530 Subject: [PATCH 14/15] widen option not avilable reverting back to increase --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6d88580f..19a020c7 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -14,7 +14,7 @@ updates: python-packages: patterns: - "*" - versioning-strategy: widen + versioning-strategy: increase ignore: - dependency-name: "tornado" # The tornado issue partially recorded in the Kanbanize ticket: From 3e4fdb50c0e871049a47c62276e4b59457b312a1 Mon Sep 17 00:00:00 2001 From: Varsha GS Date: Wed, 9 Aug 2023 17:19:02 +0530 Subject: [PATCH 15/15] ignore couchbase --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 19a020c7..c074d16d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -30,7 +30,7 @@ updates: # urllib3 (Collecting urllib3<1.27,>=1.26.5 (from instana==2.0.5->-r requirements.txt (line 2))) - dependency-name: "starlette" # starlette (Collecting starlette<0.28.0,>=0.27.0 (from fastapi>=0.92.0->-r tests/requirements-310.txt (line 7)) - #- dependency-name: "couchbase" + - dependency-name: "couchbase" - dependency-name: "protobuf" - dependency-name: "importlib-metadata" # fails for python-3.7 \ No newline at end of file