Skip to content

Commit

Permalink
Merge pull request #1518 from microsoft/laserprec/py37-support
Browse files Browse the repository at this point in the history
Run CIs in py37
  • Loading branch information
Jianjie Liu authored Oct 11, 2021
2 parents 68066dd + 34f8b0a commit 2eccb87
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 22 deletions.
27 changes: 13 additions & 14 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ on:
workflow_dispatch:
input:
tags:
description: 'Test scenario tags'
default: 'Anything to describe this manual run (optional)'
description: 'Tags to label this manual run (optional)'
default: 'Anything to describe this manual run'


jobs:
Expand All @@ -62,10 +62,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Use Python 3.6
- name: Setup Python
uses: actions/setup-python@v2
with:
python-version: 3.6
python-version: 3.7

- name: Install dependencies (tox)
run: |
Expand All @@ -87,16 +87,16 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python: [3.6]
python: [3.6, 3.7]
# different kinds of tests are located in tests/<unit|integration|smoke> folders
test-kind: ['unit', 'smoke']
# pytest markers configured in tox.ini. See https://docs.pytest.org/en/6.2.x/example/markers.html
test-marker: ['not spark and not gpu']
include:
# Integration tests need a powerful machine with more memory. GitHub-hosted agents only have 7GB memory.
# TODO: Optimization/refactoring should be done to ensure that these test can run in the default CI agent (#1507)
- os: self-hosted
python: 3.6
- os: [self-hosted, Linux, nightly]
python: [3.6, 3.7]
test-kind: 'integration'
test-marker: 'not spark and not gpu'

Expand Down Expand Up @@ -136,17 +136,16 @@ jobs:
matrix:
os: [ubuntu-latest]
java: [8]
python: [3.6]
python: [3.6, 3.7]
# different kinds of tests are located in tests/<unit|integration|smoke> folders
test-kind: ['unit', 'smoke']
# pytest markers configured in tox.ini. See https://docs.pytest.org/en/6.2.x/example/markers.html
test-marker: ['spark and not gpu']
include:
# Integration tests need a powerful machine with more memory. GitHub-hosted agents only have 7GB memory.
# TODO: Optimization/refactoring should be done to ensure that these test can run in the default CI agent (#1507)
- os: self-hosted
java: 8
python: 3.6
- os: [self-hosted, Linux, nightly]
python: [3.6, 3.7]
test-kind: 'integration'
test-marker: 'spark and not gpu'

Expand Down Expand Up @@ -182,11 +181,11 @@ jobs:
################# GPU-BUILD #################
###############################################
build-gpu:
runs-on: [self-hosted, Linux, gpu] # this is a union of labels to select specific self-hosted machine
runs-on: [self-hosted, Linux, gpu, nightly] # this is a union of labels to select specific self-hosted machine
needs: static-analysis
strategy:
matrix:
python: [3.6]
python: [3.6, 3.7]
# different kinds of tests are located in tests/<unit|integration|smoke> folders
test-kind: ['unit', 'smoke', 'integration']
# pytest markers configured in tox.ini. See https://docs.pytest.org/en/6.2.x/example/markers.html
Expand Down Expand Up @@ -225,7 +224,7 @@ jobs:
- name: Setup Python
uses: actions/[email protected]
with:
python-version: '3.6'
python-version: 3.7

- name: Download coverage reports from all previous jobs
uses: actions/download-artifact@v2
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/pr-gate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ on:
workflow_dispatch:
input:
tags:
description: 'Test scenario tags'
default: 'Anything to describe this manual run (optional)'
description: 'Tags to label this manual run (optional)'
default: 'Anything to describe this manual run'


jobs:
Expand All @@ -48,10 +48,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Use Python 3.6
- name: Setup Python
uses: actions/setup-python@v2
with:
python-version: 3.6
python-version: 3.7

- name: Install dependencies (tox)
run: |
Expand All @@ -73,7 +73,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python: [3.6]
python: [3.7]
# different kinds of tests are located in tests/<unit|integration|smoke> folders
test-kind: ['unit']
# pytest markers configured in tox.ini. See https://docs.pytest.org/en/6.2.x/example/markers.html
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
matrix:
os: [ubuntu-latest]
java: [8]
python: [3.6]
python: [3.7]
# different kinds of tests are located in tests/<unit|integration|smoke> folders
test-kind: ['unit']
# pytest markers configured in tox.ini. See https://docs.pytest.org/en/6.2.x/example/markers.html
Expand Down Expand Up @@ -157,7 +157,7 @@ jobs:
needs: static-analysis
strategy:
matrix:
python: [3.6]
python: [3.7]
# different kinds of tests are located in tests/<unit|integration|smoke> folders
test-kind: ['unit']
# pytest markers configured in tox.ini. See https://docs.pytest.org/en/6.2.x/example/markers.html
Expand Down Expand Up @@ -196,7 +196,7 @@ jobs:
- name: Setup Python
uses: actions/[email protected]
with:
python-version: '3.6'
python-version: 3.7

- name: Download coverage reports from all previous jobs
uses: actions/download-artifact@v2
Expand Down

0 comments on commit 2eccb87

Please sign in to comment.