From 22d0c2f39626d4615f73f7e619eaca3d7dc464eb Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Thu, 14 Sep 2023 14:11:58 -0700 Subject: [PATCH 01/10] 27 --- .github/workflows/build.yml | 19 ++++++++++++++-- tox-27.ini | 45 +++++++++++++++++++++++++++++++++++++ tox.ini | 5 ++--- 3 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 tox-27.ini diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 74dbffa31..fe3bdeed1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,6 @@ jobs: runs-on: ubuntu-20.04 env: # We use these variables to convert between tox and GHA version literals - py27: 2.7 py35: 3.5 py36: 3.6 py37: 3.7 @@ -23,7 +22,7 @@ jobs: # ensures the entire test matrix is run, even if one permutation fails fail-fast: false matrix: - python-version: [py27, py35, py36, py37, py38, py39] + python-version: [py35, py36, py37, py38, py39] steps: - name: Checkout code uses: actions/checkout@v2 @@ -42,3 +41,19 @@ jobs: key: v1-tox-${{ matrix.python-version }}-${{ hashFiles('tox.ini', '**/setup.py') }} - name: run tox run: tox -f ${{ matrix.python-version }} + build-27: + runs-on: ubuntu-20.04 + container: + image: python:2.7.18-buster + steps: + - name: Checkout code + uses: actions/checkout@v2 + - name: Install tox + run: pip install -U tox==3.27.1 tox-factor + - name: Cache tox environment + uses: actions/cache@v2 + with: + path: .tox-27 + key: v1-tox-27-${{ hashFiles('tox.ini', '**/setup.py') }} + - name: Run tox for Python 2.7 + run: tox -e py27 diff --git a/tox-27.ini b/tox-27.ini new file mode 100644 index 000000000..dac813b42 --- /dev/null +++ b/tox-27.ini @@ -0,0 +1,45 @@ +[tox] +envlist = + py27-unit + +[constants] +unit-base-command = py.test --quiet --cov={envdir}/opencensus --cov=context --cov=contrib --cov-report term-missing --cov-config=.coveragerc --cov-fail-under=90 --ignore=contrib/opencensus-ext-datadog tests/unit/ context/ contrib/ + +[testenv] +install_command = python -m pip install {opts} {packages} + +deps = + unit: mock==3.0.5 + unit: pytest==4.6.4 + unit: pytest-cov + unit: retrying + unit: unittest2 + py27-unit: markupsafe==1.1.1 + unit: -e context/opencensus-context + unit: -e contrib/opencensus-correlation + unit: protobuf==3.17.3 # https://github.com/protocolbuffers/protobuf/issues/8984 + unit: -e . + unit: -e contrib/opencensus-ext-azure + unit: -e contrib/opencensus-ext-dbapi + unit: -e contrib/opencensus-ext-django + unit: -e contrib/opencensus-ext-flask + unit: -e contrib/opencensus-ext-gevent + unit: -e contrib/opencensus-ext-grpc + unit: -e contrib/opencensus-ext-httplib + unit: -e contrib/opencensus-ext-jaeger + unit: -e contrib/opencensus-ext-logging + unit: -e contrib/opencensus-ext-mysql + unit: -e contrib/opencensus-ext-ocagent + unit: -e contrib/opencensus-ext-postgresql + unit: -e contrib/opencensus-ext-prometheus + unit: -e contrib/opencensus-ext-pymongo + unit: -e contrib/opencensus-ext-pymysql + unit: -e contrib/opencensus-ext-pyramid + unit: -e contrib/opencensus-ext-requests + unit: -e contrib/opencensus-ext-sqlalchemy + unit: -e contrib/opencensus-ext-threading + unit: -e contrib/opencensus-ext-zipkin + unit: -e contrib/opencensus-ext-google-cloud-clientlibs + +commands = + py27-unit: {[constants]unit-base-command} --ignore=contrib/opencensus-ext-stackdriver --ignore=contrib/opencensus-ext-flask --ignore=contrib/opencensus-ext-httpx --ignore=contrib/opencensus-ext-fastapi diff --git a/tox.ini b/tox.ini index 9802276e5..f326b1fe2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{27,35,36,37,38,39}-unit + py{35,36,37,38,39}-unit py39-bandit py39-lint py39-setup @@ -18,7 +18,6 @@ deps = unit,lint: pytest-cov unit,lint: retrying unit,lint: unittest2 - py27-unit: markupsafe==1.1.1 py35-unit: markupsafe==1.1.1 py3{6,7,8,9}-unit: markupsafe==2.0.1 # https://github.com/pallets/markupsafe/issues/282 bandit: bandit @@ -60,7 +59,7 @@ deps = docs: sphinx >= 1.6.3 commands = - py{27,34,35}-unit: {[constants]unit-base-command} --ignore=contrib/opencensus-ext-stackdriver --ignore=contrib/opencensus-ext-flask --ignore=contrib/opencensus-ext-httpx --ignore=contrib/opencensus-ext-fastapi + py{34,35}-unit: {[constants]unit-base-command} --ignore=contrib/opencensus-ext-stackdriver --ignore=contrib/opencensus-ext-flask --ignore=contrib/opencensus-ext-httpx --ignore=contrib/opencensus-ext-fastapi py36-unit: {[constants]unit-base-command} --ignore=contrib/opencensus-ext-httpx py3{7,8,9}-unit: {[constants]unit-base-command} From eb20eba2d42618d5c11c2329a4374bf038b6cf0a Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Thu, 14 Sep 2023 14:24:32 -0700 Subject: [PATCH 02/10] tox --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fe3bdeed1..93dfe9b8b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,6 +54,6 @@ jobs: uses: actions/cache@v2 with: path: .tox-27 - key: v1-tox-27-${{ hashFiles('tox.ini', '**/setup.py') }} + key: v1-tox-27-${{ hashFiles('tox-2.7.ini', '**/setup.py') }} - name: Run tox for Python 2.7 - run: tox -e py27 + run: tox -c tox-2.7.ini From b6523610df4e92d613e5f4c9a5dce98d790e1d72 Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Thu, 14 Sep 2023 14:27:51 -0700 Subject: [PATCH 03/10] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 93dfe9b8b..246653308 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,4 +56,4 @@ jobs: path: .tox-27 key: v1-tox-27-${{ hashFiles('tox-2.7.ini', '**/setup.py') }} - name: Run tox for Python 2.7 - run: tox -c tox-2.7.ini + run: tox -c ../tox-2.7.ini From 9a7acb521cea3e2cf003e53662a771afcb32e3ff Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Thu, 14 Sep 2023 14:31:22 -0700 Subject: [PATCH 04/10] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 246653308..93dfe9b8b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,4 +56,4 @@ jobs: path: .tox-27 key: v1-tox-27-${{ hashFiles('tox-2.7.ini', '**/setup.py') }} - name: Run tox for Python 2.7 - run: tox -c ../tox-2.7.ini + run: tox -c tox-2.7.ini From 3bcbb6c19400cb9b216c25d3e031eb358307ff29 Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Fri, 15 Sep 2023 10:27:54 -0700 Subject: [PATCH 05/10] tox --- .github/workflows/build.yml | 8 ++++--- tox-27.ini | 45 ------------------------------------- tox.ini | 8 ++++--- 3 files changed, 10 insertions(+), 51 deletions(-) delete mode 100644 tox-27.ini diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 93dfe9b8b..b3a3d27fa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,6 +45,8 @@ jobs: runs-on: ubuntu-20.04 container: image: python:2.7.18-buster + env: + py27: 2.7 steps: - name: Checkout code uses: actions/checkout@v2 @@ -53,7 +55,7 @@ jobs: - name: Cache tox environment uses: actions/cache@v2 with: - path: .tox-27 - key: v1-tox-27-${{ hashFiles('tox-2.7.ini', '**/setup.py') }} + path: .tox + key: v1-tox-27-${{ hashFiles('tox.ini', '**/setup.py') }} - name: Run tox for Python 2.7 - run: tox -c tox-2.7.ini + run: tox -c tox.ini diff --git a/tox-27.ini b/tox-27.ini deleted file mode 100644 index dac813b42..000000000 --- a/tox-27.ini +++ /dev/null @@ -1,45 +0,0 @@ -[tox] -envlist = - py27-unit - -[constants] -unit-base-command = py.test --quiet --cov={envdir}/opencensus --cov=context --cov=contrib --cov-report term-missing --cov-config=.coveragerc --cov-fail-under=90 --ignore=contrib/opencensus-ext-datadog tests/unit/ context/ contrib/ - -[testenv] -install_command = python -m pip install {opts} {packages} - -deps = - unit: mock==3.0.5 - unit: pytest==4.6.4 - unit: pytest-cov - unit: retrying - unit: unittest2 - py27-unit: markupsafe==1.1.1 - unit: -e context/opencensus-context - unit: -e contrib/opencensus-correlation - unit: protobuf==3.17.3 # https://github.com/protocolbuffers/protobuf/issues/8984 - unit: -e . - unit: -e contrib/opencensus-ext-azure - unit: -e contrib/opencensus-ext-dbapi - unit: -e contrib/opencensus-ext-django - unit: -e contrib/opencensus-ext-flask - unit: -e contrib/opencensus-ext-gevent - unit: -e contrib/opencensus-ext-grpc - unit: -e contrib/opencensus-ext-httplib - unit: -e contrib/opencensus-ext-jaeger - unit: -e contrib/opencensus-ext-logging - unit: -e contrib/opencensus-ext-mysql - unit: -e contrib/opencensus-ext-ocagent - unit: -e contrib/opencensus-ext-postgresql - unit: -e contrib/opencensus-ext-prometheus - unit: -e contrib/opencensus-ext-pymongo - unit: -e contrib/opencensus-ext-pymysql - unit: -e contrib/opencensus-ext-pyramid - unit: -e contrib/opencensus-ext-requests - unit: -e contrib/opencensus-ext-sqlalchemy - unit: -e contrib/opencensus-ext-threading - unit: -e contrib/opencensus-ext-zipkin - unit: -e contrib/opencensus-ext-google-cloud-clientlibs - -commands = - py27-unit: {[constants]unit-base-command} --ignore=contrib/opencensus-ext-stackdriver --ignore=contrib/opencensus-ext-flask --ignore=contrib/opencensus-ext-httpx --ignore=contrib/opencensus-ext-fastapi diff --git a/tox.ini b/tox.ini index f326b1fe2..a58c9ff5b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{35,36,37,38,39}-unit + py{27,35,36,37,38,39}-unit py39-bandit py39-lint py39-setup @@ -18,6 +18,7 @@ deps = unit,lint: pytest-cov unit,lint: retrying unit,lint: unittest2 + py27-unit: markupsafe==1.1.1 py35-unit: markupsafe==1.1.1 py3{6,7,8,9}-unit: markupsafe==2.0.1 # https://github.com/pallets/markupsafe/issues/282 bandit: bandit @@ -59,7 +60,7 @@ deps = docs: sphinx >= 1.6.3 commands = - py{34,35}-unit: {[constants]unit-base-command} --ignore=contrib/opencensus-ext-stackdriver --ignore=contrib/opencensus-ext-flask --ignore=contrib/opencensus-ext-httpx --ignore=contrib/opencensus-ext-fastapi + py{27,34,35}-unit: {[constants]unit-base-command} --ignore=contrib/opencensus-ext-stackdriver --ignore=contrib/opencensus-ext-flask --ignore=contrib/opencensus-ext-httpx --ignore=contrib/opencensus-ext-fastapi py36-unit: {[constants]unit-base-command} --ignore=contrib/opencensus-ext-httpx py3{7,8,9}-unit: {[constants]unit-base-command} @@ -70,4 +71,5 @@ commands = bandit: bandit -r context/ contrib/ opencensus/ -lll -q py39-setup: python setup.py check --restructuredtext --strict py39-docs: bash ./scripts/update_docs.sh - ; TODO deployment \ No newline at end of file + ; TODO deployment + \ No newline at end of file From e25712a3e842f20553905bcb7deb692fdf2cb1a8 Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Fri, 15 Sep 2023 10:38:43 -0700 Subject: [PATCH 06/10] Update build.yml --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b3a3d27fa..686ca2cc7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,6 +47,11 @@ jobs: image: python:2.7.18-buster env: py27: 2.7 + strategy: + # ensures the entire test matrix is run, even if one permutation fails + fail-fast: false + matrix: + python-version: [py37] steps: - name: Checkout code uses: actions/checkout@v2 From 15c6d8943724444c2efcf346629b476250d124ef Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Fri, 15 Sep 2023 10:49:38 -0700 Subject: [PATCH 07/10] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 686ca2cc7..c41b7df68 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,7 +51,7 @@ jobs: # ensures the entire test matrix is run, even if one permutation fails fail-fast: false matrix: - python-version: [py37] + python-version: [py27] steps: - name: Checkout code uses: actions/checkout@v2 From e04e22fb56a3ecf30442c68691c2f03c1e21a0b8 Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Fri, 15 Sep 2023 10:59:40 -0700 Subject: [PATCH 08/10] Update build.yml --- .github/workflows/build.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c41b7df68..aa8a05f51 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,11 +47,6 @@ jobs: image: python:2.7.18-buster env: py27: 2.7 - strategy: - # ensures the entire test matrix is run, even if one permutation fails - fail-fast: false - matrix: - python-version: [py27] steps: - name: Checkout code uses: actions/checkout@v2 @@ -63,4 +58,4 @@ jobs: path: .tox key: v1-tox-27-${{ hashFiles('tox.ini', '**/setup.py') }} - name: Run tox for Python 2.7 - run: tox -c tox.ini + run: tox -f py27 From cca8cea9a3939076beee9a29efe4e95c9df47ee2 Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Fri, 15 Sep 2023 11:48:15 -0700 Subject: [PATCH 09/10] Update tox.ini --- tox.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/tox.ini b/tox.ini index a58c9ff5b..321fbab51 100644 --- a/tox.ini +++ b/tox.ini @@ -72,4 +72,3 @@ commands = py39-setup: python setup.py check --restructuredtext --strict py39-docs: bash ./scripts/update_docs.sh ; TODO deployment - \ No newline at end of file From 4892d5d84b5b00845e13a88a8087cae9185027db Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Fri, 15 Sep 2023 11:48:40 -0700 Subject: [PATCH 10/10] Update tox.ini --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 321fbab51..9802276e5 100644 --- a/tox.ini +++ b/tox.ini @@ -71,4 +71,4 @@ commands = bandit: bandit -r context/ contrib/ opencensus/ -lll -q py39-setup: python setup.py check --restructuredtext --strict py39-docs: bash ./scripts/update_docs.sh - ; TODO deployment + ; TODO deployment \ No newline at end of file