Skip to content

Commit a4c634c

Browse files
authored
Merge branch 'elastic:master' into patch-1
2 parents 1b6d085 + dd01010 commit a4c634c

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ jobs:
4343
runs-on: ubuntu-latest
4444
steps:
4545
- name: Checkout Repository
46-
uses: actions/checkout@v1
46+
uses: actions/checkout@v2
4747
- name: Set up Python 3.8
48-
uses: actions/setup-python@v1
48+
uses: actions/setup-python@v2
4949
with:
5050
python-version: 3.8
5151
- name: Install dependencies
@@ -65,24 +65,24 @@ jobs:
6565

6666
steps:
6767
- name: Checkout Repository
68-
uses: actions/checkout@v1
68+
uses: actions/checkout@v2
6969
- name: Setup Elasticsearch
7070
run: |
7171
mkdir /tmp/elasticsearch
7272
wget -O - https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${{ matrix.es-version }}-linux-x86_64.tar.gz | tar xz --directory=/tmp/elasticsearch --strip-components=1
7373
/tmp/elasticsearch/bin/elasticsearch -d
7474
- name: Setup Python - ${{ matrix.python-version }}
75-
uses: actions/setup-python@v1
75+
uses: actions/setup-python@v2
7676
with:
7777
python-version: ${{ matrix.python-version }}
7878
- name: Set up Python 3.8 for Nox
7979
if: matrix.python-version != '3.8'
80-
uses: actions/setup-python@v1
80+
uses: actions/setup-python@v2
8181
with:
82-
python-version: 3.8
82+
python-version: 3
8383
- name: Install dependencies
8484
run: |
85-
python3.8 -m pip install nox
85+
python3 -m pip install nox
8686
- name: Run Tests
8787
run: |
8888
nox -rs test-${{ matrix.python-version }}

noxfile.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def test(session):
4646

4747
@nox.session()
4848
def format(session):
49-
session.install("black", "isort")
49+
session.install("black==21.12b0", "click==8.0.4", "isort")
5050
session.run(
5151
"black", "--target-version=py27", "--target-version=py37", *SOURCE_FILES
5252
)
@@ -58,7 +58,7 @@ def format(session):
5858

5959
@nox.session
6060
def lint(session):
61-
session.install("flake8", "black", "isort")
61+
session.install("flake8", "black==21.12b0", "click==8.0.4", "isort")
6262
session.run(
6363
"black",
6464
"--check",

0 commit comments

Comments
 (0)