Skip to content

Commit 85c1476

Browse files
authored
Merge pull request #192 from lzchen/fix
2 parents 9c5b06e + f1821c4 commit 85c1476

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ jobs:
1010
build:
1111
env:
1212
# We use these variables to convert between tox and GHA version literals
13-
py36: 3.6
1413
py37: 3.7
1514
py38: 3.8
1615
py39: 3.9
@@ -20,7 +19,7 @@ jobs:
2019
strategy:
2120
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
2221
matrix:
23-
python-version: [ py36, py37, py38, py39, py310 ]
22+
python-version: [ py37, py38, py39, py310 ]
2423
package: ["distro"]
2524
os: [ ubuntu-20.04, windows-2019 ]
2625
steps:
@@ -41,11 +40,6 @@ jobs:
4140
.tox
4241
~/.cache/pip
4342
key: v3-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'test-requirements.txt') }}
44-
# tox fails on windows and Python3.6 when tox dir is reused between builds so we remove it
45-
- name: fix for windows + py3.6
46-
if: ${{ matrix.os == 'windows-2019' && matrix.python-version == 'py36' }}
47-
shell: pwsh
48-
run: Remove-Item .\.tox\ -Force -Recurse -ErrorAction Ignore
4943
misc:
5044
strategy:
5145
fail-fast: false

CHANGELOG.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
# Changelog
22

33
## Unreleased
4-
- Moved distro code to azure-monitor-opentelemetry-distro
4+
5+
- Drop support for Python 3.6
6+
([#190](https://github.com/microsoft/ApplicationInsights-Python/pull/190))
7+
- Changed repository structure to use submodules
58
([#190](https://github.com/microsoft/ApplicationInsights-Python/pull/190))
69
- Added OpenTelemetry Distro and Configurator
710
([#187](https://github.com/microsoft/ApplicationInsights-Python/pull/187))
8-
- Initial commit
11+
- Initial commit

azure-monitor-opentelemetry-distro/setup.cfg

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ classifiers =
1616
Development Status :: 4 - Beta
1717
Programming Language :: Python
1818
Programming Language :: Python :: 3
19-
Programming Language :: Python :: 3.6
2019
Programming Language :: Python :: 3.7
2120
Programming Language :: Python :: 3.8
2221
Programming Language :: Python :: 3.9
@@ -25,7 +24,7 @@ classifiers =
2524
Typing :: Typed
2625

2726
[options]
28-
python_requires = >=3.6
27+
python_requires = >=3.7
2928
package_dir=
3029
=src
3130
packages=find_namespace:

0 commit comments

Comments
 (0)