Skip to content

infra: accelerate builds #693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
codeboten merged 15 commits into from
May 21, 2020
Merged

infra: accelerate builds #693

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
cfc9e7e
infra: split lint/docker-tests/docs
May 14, 2020
1ded1ff
fix config
May 14, 2020
4481858
adding timing info for debugging
May 14, 2020
6a50fa2
remove ts
May 14, 2020
8c19bb3
debugging
May 14, 2020
552ef98
adding debug script
May 14, 2020
3111f72
each separate line causes unnecessary delays in tox
May 15, 2020
1fa420c
upgrade pip before running tox
May 15, 2020
3b99771
clean up
May 15, 2020
81619d5
upgrade pip for old versions of python
May 15, 2020
6ac0d2a
Merge branch 'master' into faster-build
May 15, 2020
a5abbe4
need to re-enable pip upgrade for py 3.7
May 21, 2020
4962a3a
Merge branch 'master' into faster-build
May 21, 2020
e046021
Merge branch 'master' into faster-build
May 21, 2020
8b71442
Merge branch 'master' into faster-build
May 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,20 @@ language: python

cache: pip

python:
- 'pypy3'
- '3.8'
- '3.4'
- '3.5'
- '3.6'
- '3.7'
matrix:
include:
- python: 3.8
env: TOXENV=lint
- python: pypy3
- python: 3.8
- python: 3.4
- python: 3.5
- python: 3.6
- python: 3.7
- python: 3.8
env: TOXENV=docker-tests
- python: 3.8
env: TOXENV=docs

#matrix:
# allow_failures:
Expand All @@ -20,6 +27,7 @@ services:
- docker

install:
- python -m pip install -U pip setuptools wheel
- pip install tox-travis

script:
Expand Down
54 changes: 14 additions & 40 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,6 @@ envlist =
docs
docker-tests

[travis]
python =
3.8: py38, lint, docs, docker-tests

[testenv]
deps =
-c dev-requirements.txt
Expand Down Expand Up @@ -164,26 +160,16 @@ changedir =

commands_pre =
; Install without -e to test the actual installation
python -m pip install -U pip setuptools wheel

py3{4,5,6}: python -m pip install -U pip setuptools wheel
Copy link
Copy Markdown
Contributor

@lzchen lzchen May 19, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason why we still need this line if it is run in travis.yml?

Copy link
Copy Markdown
Contributor Author

@codeboten codeboten May 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, upgrading pip in travis before bringing up virtualenvs via tox was part of a failed experiment. I've reverted the change in the travis file, and kept the pip install -U command for the versions of python that needed it.

; Install common packages for all the tests. These are not needed in all the
; cases but it saves a lot of boilerplate in this file.
test: pip install {toxinidir}/opentelemetry-api
test: pip install {toxinidir}/opentelemetry-sdk
test: pip install {toxinidir}/tests/util
test: pip install {toxinidir}/opentelemetry-api {toxinidir}/opentelemetry-sdk {toxinidir}/tests/util

test-auto-instrumentation: pip install {toxinidir}/opentelemetry-auto-instrumentation

example-app: pip install {toxinidir}/opentelemetry-auto-instrumentation
example-app: pip install {toxinidir}/ext/opentelemetry-ext-requests
example-app: pip install {toxinidir}/ext/opentelemetry-ext-wsgi
example-app: pip install {toxinidir}/ext/opentelemetry-ext-flask
example-app: pip install {toxinidir}/docs/examples/opentelemetry-example-app
example-app: pip install {toxinidir}/opentelemetry-auto-instrumentation {toxinidir}/ext/opentelemetry-ext-requests {toxinidir}/ext/opentelemetry-ext-wsgi {toxinidir}/ext/opentelemetry-ext-flask {toxinidir}/docs/examples/opentelemetry-example-app

example-http: pip install -e {toxinidir}/opentelemetry-auto-instrumentation
example-http: pip install -e {toxinidir}/ext/opentelemetry-ext-requests
example-http: pip install -e {toxinidir}/ext/opentelemetry-ext-wsgi
example-http: pip install -r {toxinidir}/docs/examples/http/requirements.txt
example-http: pip install -e {toxinidir}/opentelemetry-auto-instrumentation -e {toxinidir}/ext/opentelemetry-ext-requests -e {toxinidir}/ext/opentelemetry-ext-wsgi -r {toxinidir}/docs/examples/http/requirements.txt

grpc: pip install {toxinidir}/ext/opentelemetry-ext-grpc[test]

Expand All @@ -196,47 +182,35 @@ commands_pre =

django: pip install {toxinidir}/ext/opentelemetry-ext-django[test]

mysql: pip install {toxinidir}/opentelemetry-auto-instrumentation
mysql: pip install {toxinidir}/ext/opentelemetry-ext-dbapi
mysql: pip install {toxinidir}/ext/opentelemetry-ext-mysql[test]
mysql: pip install {toxinidir}/opentelemetry-auto-instrumentation {toxinidir}/ext/opentelemetry-ext-dbapi {toxinidir}/ext/opentelemetry-ext-mysql[test]

otcollector: pip install {toxinidir}/ext/opentelemetry-ext-otcollector

prometheus: pip install {toxinidir}/ext/opentelemetry-ext-prometheus

pymongo: pip install {toxinidir}/opentelemetry-auto-instrumentation
pymongo: pip install {toxinidir}/ext/opentelemetry-ext-pymongo[test]
pymongo: pip install {toxinidir}/opentelemetry-auto-instrumentation {toxinidir}/ext/opentelemetry-ext-pymongo[test]

psycopg2: pip install {toxinidir}/ext/opentelemetry-ext-dbapi
psycopg2: pip install {toxinidir}/ext/opentelemetry-ext-psycopg2
psycopg2: pip install {toxinidir}/ext/opentelemetry-ext-dbapi {toxinidir}/ext/opentelemetry-ext-psycopg2

pymysql: pip install {toxinidir}/opentelemetry-auto-instrumentation
pymysql: pip install {toxinidir}/ext/opentelemetry-ext-dbapi
pymysql: pip install {toxinidir}/ext/opentelemetry-ext-pymysql[test]
pymysql: pip install {toxinidir}/opentelemetry-auto-instrumentation {toxinidir}/ext/opentelemetry-ext-dbapi {toxinidir}/ext/opentelemetry-ext-pymysql[test]

redis: pip install {toxinidir}/opentelemetry-auto-instrumentation
redis: pip install {toxinidir}/ext/opentelemetry-ext-redis[test]
redis: pip install {toxinidir}/opentelemetry-auto-instrumentation {toxinidir}/ext/opentelemetry-ext-redis[test]

requests: pip install {toxinidir}/opentelemetry-auto-instrumentation
requests: pip install {toxinidir}/ext/opentelemetry-ext-requests[test]
requests: pip install {toxinidir}/opentelemetry-auto-instrumentation {toxinidir}/ext/opentelemetry-ext-requests[test]

jinja2: pip install {toxinidir}/opentelemetry-auto-instrumentation
jinja2: pip install {toxinidir}/ext/opentelemetry-ext-jinja2[test]
jinja2: pip install {toxinidir}/opentelemetry-auto-instrumentation {toxinidir}/ext/opentelemetry-ext-jinja2[test]

aiohttp-client: pip install {toxinidir}/opentelemetry-sdk
aiohttp-client: pip install {toxinidir}/ext/opentelemetry-ext-aiohttp-client
aiohttp-client: pip install {toxinidir}/opentelemetry-sdk {toxinidir}/ext/opentelemetry-ext-aiohttp-client

jaeger: pip install {toxinidir}/ext/opentelemetry-ext-jaeger

datadog: pip install {toxinidir}/opentelemetry-sdk
datadog: pip install {toxinidir}/ext/opentelemetry-ext-datadog
datadog: pip install {toxinidir}/opentelemetry-sdk {toxinidir}/ext/opentelemetry-ext-datadog

opentracing-shim: pip install {toxinidir}/ext/opentelemetry-ext-opentracing-shim

zipkin: pip install {toxinidir}/ext/opentelemetry-ext-zipkin

sqlalchemy: pip install {toxinidir}/opentelemetry-auto-instrumentation
sqlalchemy: pip install {toxinidir}/ext/opentelemetry-ext-sqlalchemy
sqlalchemy: pip install {toxinidir}/opentelemetry-auto-instrumentation {toxinidir}/ext/opentelemetry-ext-sqlalchemy

; In order to get a healthy coverage report,
; we have to install packages in editable mode.
Expand Down
⚡