Skip to content

Commit

Permalink
Merge pull request #192 from lzchen/fix
Browse files Browse the repository at this point in the history
  • Loading branch information
lzchen authored Aug 25, 2022
2 parents 9c5b06e + f1821c4 commit 85c1476
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 11 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ jobs:
build:
env:
# We use these variables to convert between tox and GHA version literals
py36: 3.6
py37: 3.7
py38: 3.8
py39: 3.9
Expand All @@ -20,7 +19,7 @@ jobs:
strategy:
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
matrix:
python-version: [ py36, py37, py38, py39, py310 ]
python-version: [ py37, py38, py39, py310 ]
package: ["distro"]
os: [ ubuntu-20.04, windows-2019 ]
steps:
Expand All @@ -41,11 +40,6 @@ jobs:
.tox
~/.cache/pip
key: v3-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'test-requirements.txt') }}
# tox fails on windows and Python3.6 when tox dir is reused between builds so we remove it
- name: fix for windows + py3.6
if: ${{ matrix.os == 'windows-2019' && matrix.python-version == 'py36' }}
shell: pwsh
run: Remove-Item .\.tox\ -Force -Recurse -ErrorAction Ignore
misc:
strategy:
fail-fast: false
Expand Down
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
# Changelog

## Unreleased
- Moved distro code to azure-monitor-opentelemetry-distro

- Drop support for Python 3.6
([#190](https://github.com/microsoft/ApplicationInsights-Python/pull/190))
- Changed repository structure to use submodules
([#190](https://github.com/microsoft/ApplicationInsights-Python/pull/190))
- Added OpenTelemetry Distro and Configurator
([#187](https://github.com/microsoft/ApplicationInsights-Python/pull/187))
- Initial commit
- Initial commit
3 changes: 1 addition & 2 deletions azure-monitor-opentelemetry-distro/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ classifiers =
Development Status :: 4 - Beta
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Expand All @@ -25,7 +24,7 @@ classifiers =
Typing :: Typed

[options]
python_requires = >=3.6
python_requires = >=3.7
package_dir=
=src
packages=find_namespace:
Expand Down

0 comments on commit 85c1476

Please sign in to comment.