testing

Author: emdneto

.github/workflows/generate_workflows.py

@@ -14,7 +14,7 @@
 )
 _tox_lint_env_regex = re_compile(r"lint-(?P<name>[-\w]+)")
 _tox_contrib_env_regex = re_compile(
-    r"py38-test-(?P<name>[-\w]+\w)-?(?P<contrib_requirements>\d+)?"
+    r"py39-test-(?P<name>[-\w]+\w)-?(?P<contrib_requirements>\d+)?"
 )
 
 

tox.ini

@@ -8,7 +8,6 @@ envlist =
     ; Environments are organized by individual package, allowing
     ; for specifying supported Python versions per package.
 
-<<<<<<< HEAD
     py3{9,10,11,12,13}-test-opentelemetry-api
     pypy3-test-opentelemetry-api
     lint-opentelemetry-api
@@ -24,23 +23,6 @@ envlist =
 
     py3{9,10,11,12,13}-test-opentelemetry-semantic-conventions
     pypy3-test-opentelemetry-semantic-conventions
-=======
-    py3{8,9,10,11,12,13}-test-opentelemetry-api
-    pypy38-test-opentelemetry-api
-    lint-opentelemetry-api
-
-    py3{8,9,10,11,12,13}-test-opentelemetry-proto-protobuf5
-    pypy38-test-opentelemetry-proto-protobuf5
-    lint-opentelemetry-proto-protobuf5
-
-    py3{8,9,10,11,12,13}-test-opentelemetry-sdk
-    pypy38-test-opentelemetry-sdk
-    lint-opentelemetry-sdk
-    benchmark-opentelemetry-sdk
-
-    py3{8,9,10,11,12,13}-test-opentelemetry-semantic-conventions
-    pypy38-test-opentelemetry-semantic-conventions
->>>>>>> a66a495d (try pypy38)
     lint-opentelemetry-semantic-conventions
 
     py3{9,10,11,12,13}-test-opentelemetry-getting-started
@@ -176,12 +158,6 @@ setenv =
   ; i.e: CONTRIB_REPO_SHA=dde62cebffe519c35875af6d06fae053b3be65ec tox -e <env to test>
   CONTRIB_REPO_SHA={env:CONTRIB_REPO_SHA:main}
   CONTRIB_REPO=git+https://github.com/open-telemetry/opentelemetry-python-contrib.git@{env:CONTRIB_REPO_SHA}
-<<<<<<< HEAD
-=======
-  UV_CONFIG_FILE={toxinidir}/tox-uv.toml
-  #UV_PYTHON_PREFERENCE=only
-  mypy: MYPYPATH={toxinidir}/opentelemetry-api/src/:{toxinidir}/opentelemetry-semantic-conventions/src/:{toxinidir}/opentelemetry-sdk/src/:{toxinidir}/tests/opentelemetry-test-utils/src/
->>>>>>> 18b9bad6 (try uv only-system)
 commands_pre =
   ; In order to get a healthy coverage report,
   ; we have to install packages in editable mode.