From fa673c365574b0561507e50ebfea64c437d285c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Neum=C3=BCller?= Date: Thu, 5 Sep 2019 11:29:34 +0200 Subject: [PATCH 1/3] Fix setup for ext packages. Previously the wheels would contain the metadata but not the actual code. --- ext/opentelemetry-ext-http-requests/setup.cfg | 2 +- ext/opentelemetry-ext-wsgi/setup.cfg | 2 +- tox.ini | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/opentelemetry-ext-http-requests/setup.cfg b/ext/opentelemetry-ext-http-requests/setup.cfg index 01ee81fda1f..7d41a525cd9 100644 --- a/ext/opentelemetry-ext-http-requests/setup.cfg +++ b/ext/opentelemetry-ext-http-requests/setup.cfg @@ -37,7 +37,7 @@ classifiers = python_requires = >=3.4 package_dir= =src -packages=find: +packages=find_namespace: install_requires = opentelemetry-api >= 0.1.dev0 requests ~= 2.0 diff --git a/ext/opentelemetry-ext-wsgi/setup.cfg b/ext/opentelemetry-ext-wsgi/setup.cfg index a77e9fd1fb3..4405e37a302 100644 --- a/ext/opentelemetry-ext-wsgi/setup.cfg +++ b/ext/opentelemetry-ext-wsgi/setup.cfg @@ -37,7 +37,7 @@ classifiers = python_requires = >=3.4 package_dir= =src -packages=find: +packages=find_namespace: install_requires = opentelemetry-api diff --git a/tox.ini b/tox.ini index 5cbdfa2d5e9..092e8a3114c 100644 --- a/tox.ini +++ b/tox.ini @@ -30,8 +30,8 @@ commands_pre = test: pip install -e {toxinidir}/opentelemetry-api test-sdk: pip install -e {toxinidir}/opentelemetry-sdk ext: pip install -e {toxinidir}/opentelemetry-api - wsgi: pip install -e {toxinidir}/ext/opentelemetry-ext-wsgi - http-requests: pip install -e {toxinidir}/ext/opentelemetry-ext-http-requests + wsgi: pip install {toxinidir}/ext/opentelemetry-ext-wsgi + http-requests: pip install {toxinidir}/ext/opentelemetry-ext-http-requests commands = mypy: mypy --namespace-packages opentelemetry-api/src/opentelemetry/ From 5ede830f83ea1033654bc4b3bb76ee740e9008a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Neum=C3=BCller?= Date: Fri, 6 Sep 2019 11:19:52 +0200 Subject: [PATCH 2/3] Check that all packages install properly in test. --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 092e8a3114c..1c9f0c6624d 100644 --- a/tox.ini +++ b/tox.ini @@ -27,9 +27,9 @@ changedir = commands_pre = python -m pip install -U pip setuptools wheel - test: pip install -e {toxinidir}/opentelemetry-api - test-sdk: pip install -e {toxinidir}/opentelemetry-sdk - ext: pip install -e {toxinidir}/opentelemetry-api + test: pip install {toxinidir}/opentelemetry-api + test-sdk: pip install {toxinidir}/opentelemetry-sdk + ext: pip install {toxinidir}/opentelemetry-api wsgi: pip install {toxinidir}/ext/opentelemetry-ext-wsgi http-requests: pip install {toxinidir}/ext/opentelemetry-ext-http-requests From 0375f252ad039ad6986fd3da046dc875b4924f34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Neum=C3=BCller?= Date: Fri, 6 Sep 2019 11:25:33 +0200 Subject: [PATCH 3/3] Document why we don't use -e. --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 1c9f0c6624d..acf1bcb367c 100644 --- a/tox.ini +++ b/tox.ini @@ -26,6 +26,7 @@ changedir = test-ext-http-requests: ext/opentelemetry-ext-http-requests/tests commands_pre = +; Install without -e to test the actual installation python -m pip install -U pip setuptools wheel test: pip install {toxinidir}/opentelemetry-api test-sdk: pip install {toxinidir}/opentelemetry-sdk