Skip to content

Commit d9a1af4

Browse files
authored
Drop support for Python 3.6, add 3.10 and 3.11 (#203)
This follows the supported versions in upstream OTel python.
1 parent 6aa1731 commit d9a1af4

File tree

6 files changed

+22
-18
lines changed

6 files changed

+22
-18
lines changed

.circleci/config.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ executors:
55
# in tox.ini
66
dev_python:
77
docker:
8-
- image: circleci/python:3.9
8+
- image: cimg/python:3.10
99

1010
commands:
1111
run_with_pip_cache:
@@ -50,15 +50,15 @@ commands:
5050
description: Checkout code and install tox
5151
steps:
5252
- checkout
53-
- run: sudo pip install tox-factor
53+
- run: pip install tox-factor
5454

5555
jobs:
5656
lint:
5757
executor: dev_python
5858
steps:
5959
- setup
6060
- run_with_pip_cache:
61-
cache_key_base: lint-python3.9
61+
cache_key_base: lint-python3.10
6262
steps:
6363
- run: tox -s false -f lint-ci
6464

@@ -67,7 +67,7 @@ jobs:
6767
steps:
6868
- setup
6969
- run_with_pip_cache:
70-
cache_key_base: lint-python3.9
70+
cache_key_base: lint-python3.10
7171
steps:
7272
- run: tox -s false -f docs-ci
7373
- run:
@@ -84,7 +84,7 @@ jobs:
8484
steps:
8585
- setup
8686
- run_with_pip_cache:
87-
cache_key_base: mypy-python3.9
87+
cache_key_base: mypy-python3.10
8888
steps:
8989
- run: tox -s false -f mypy-ci
9090
- store_test_results_command
@@ -95,7 +95,7 @@ jobs:
9595
type: integer
9696
description: The x in python3.x
9797
docker:
98-
- image: circleci/python:3.<< parameters.python3_minor >>
98+
- image: cimg/python:3.<< parameters.python3_minor >>
9999
steps:
100100
- setup
101101
- run_with_pip_cache:
@@ -120,4 +120,4 @@ workflows:
120120
name: tests-python3.<< matrix.python3_minor >>
121121
matrix:
122122
parameters:
123-
python3_minor: [6, 7, 8, 9]
123+
python3_minor: [7, 8, 9, 10, 11]

opentelemetry-exporter-gcp-monitoring/setup.cfg

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@ classifiers =
1414
License :: OSI Approved :: Apache Software License
1515
Programming Language :: Python
1616
Programming Language :: Python :: 3
17-
Programming Language :: Python :: 3.6
1817
Programming Language :: Python :: 3.7
1918
Programming Language :: Python :: 3.8
2019
Programming Language :: Python :: 3.9
20+
Programming Language :: Python :: 3.10
21+
Programming Language :: Python :: 3.11
2122

2223
[options]
23-
python_requires = >=3.6
24+
python_requires = >=3.7
2425
package_dir=
2526
=src
2627
packages=find_namespace:

opentelemetry-exporter-gcp-trace/setup.cfg

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@ classifiers =
1414
License :: OSI Approved :: Apache Software License
1515
Programming Language :: Python
1616
Programming Language :: Python :: 3
17-
Programming Language :: Python :: 3.6
1817
Programming Language :: Python :: 3.7
1918
Programming Language :: Python :: 3.8
2019
Programming Language :: Python :: 3.9
20+
Programming Language :: Python :: 3.10
21+
Programming Language :: Python :: 3.11
2122

2223
[options]
23-
python_requires = >=3.6
24+
python_requires = >=3.7
2425
package_dir=
2526
=src
2627
packages=find_namespace:

opentelemetry-propagator-gcp/setup.cfg

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@ classifiers =
1414
License :: OSI Approved :: Apache Software License
1515
Programming Language :: Python
1616
Programming Language :: Python :: 3
17-
Programming Language :: Python :: 3.6
1817
Programming Language :: Python :: 3.7
1918
Programming Language :: Python :: 3.8
2019
Programming Language :: Python :: 3.9
20+
Programming Language :: Python :: 3.10
21+
Programming Language :: Python :: 3.11
2122

2223
[options]
23-
python_requires = >=3.6
24+
python_requires = >=3.7
2425
package_dir=
2526
=src
2627
packages=find_namespace:

opentelemetry-resourcedetector-gcp/setup.cfg

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@ classifiers =
1414
License :: OSI Approved :: Apache Software License
1515
Programming Language :: Python
1616
Programming Language :: Python :: 3
17-
Programming Language :: Python :: 3.6
1817
Programming Language :: Python :: 3.7
1918
Programming Language :: Python :: 3.8
2019
Programming Language :: Python :: 3.9
20+
Programming Language :: Python :: 3.10
21+
Programming Language :: Python :: 3.11
2122

2223
[options]
23-
python_requires = >=3.6
24+
python_requires = >=3.7
2425
package_dir=
2526
=src
2627
packages=find_namespace:

tox.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ skipsdist = True
33
skip_missing_interpreters = True
44
envlist =
55
; Add the `ci` factor to any env that should be running during CI.
6-
py3{6,7,8,9}-ci-test-{cloudtrace,cloudmonitoring,propagator,resourcedetector}
6+
py3{7,8,9,10,11}-ci-test-{cloudtrace,cloudmonitoring,propagator,resourcedetector}
77
{lint,mypy}-ci-{cloudtrace,cloudmonitoring,propagator,resourcedetector}
88
docs-ci
99

@@ -21,7 +21,7 @@ base_deps =
2121
-c {toxinidir}/dev-constraints.txt
2222
-e {toxinidir}/test-common
2323

24-
dev_basepython = python3.9
24+
dev_basepython = python3.10
2525
dev_deps =
2626
{[constants]base_deps}
2727
black
@@ -45,7 +45,7 @@ setenv =
4545
propagator: PACKAGE_NAME = opentelemetry-propagator-gcp
4646
resourcedetector: PACKAGE_NAME = opentelemetry-resourcedetector-gcp
4747

48-
[testenv:py3{6,7,8,9}-ci-test-{cloudtrace,cloudmonitoring,propagator,resourcedetector}]
48+
[testenv:py3{7,8,9,10,11}-ci-test-{cloudtrace,cloudmonitoring,propagator,resourcedetector}]
4949
deps =
5050
test: {[constants]base_deps}
5151
test: pytest

0 commit comments

Comments
 (0)