Skip to content

Commit e0c6b8e

Browse files
author
jerem
committed
Merge remote-tracking branch 'origin/master' into release/1.3
2 parents 643b75b + 38fe5ae commit e0c6b8e

8 files changed

Lines changed: 740 additions & 123 deletions

File tree

.github/workflows/checks.yml

Lines changed: 9 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -9,66 +9,24 @@ jobs:
99
python-version: [3.5, 3.6, 3.7, 3.8]
1010
steps:
1111
- uses: actions/checkout@v1
12+
1213
- name: Set up Python ${{ matrix.python-version }}
1314
uses: actions/setup-python@v1
1415
with:
1516
python-version: ${{ matrix.python-version }}
16-
- name: Install dmenv
17-
uses: TankerHQ/dmenv-install-action@v1.0.0
18-
with:
19-
dmenv-version: 0.20.0
20-
- name: Prepare project for development
21-
run: dmenv install
22-
- name: Run tests
23-
run: dmenv run -- pytest
2417

25-
python34:
26-
runs-on: ubuntu-16.04
27-
steps:
28-
- uses: actions/checkout@v1
29-
- name: Set up Python 3.4
30-
uses: actions/setup-python@v1
31-
with:
32-
python-version: 3.4
33-
- name: Install dmenv
34-
uses: TankerHQ/dmenv-install-action@v1.0.0
35-
with:
36-
dmenv-version: 0.20.0
18+
- name: Install and configure poetry
19+
run: |
20+
python -m pip install poetry
21+
python -m poetry config virtualenvs.create false
22+
3723
- name: Prepare project for development
38-
run: dmenv install
39-
- name: Run tests
40-
run: dmenv run -- pytest
24+
run: python -m poetry install
4125

42-
python2:
43-
runs-on: ubuntu-latest
44-
steps:
45-
- uses: actions/checkout@v1
46-
- name: Set up Python 2.7
47-
uses: actions/setup-python@v1
48-
with:
49-
python-version: 2.7
50-
- name: Install dependencies
51-
run: pip install -r requirements.lock
5226
- name: Run tests
53-
run: pytest
27+
run: python -m poetry run pytest
5428

55-
coverage:
56-
runs-on: ubuntu-latest
57-
steps:
58-
- uses: actions/checkout@v1
59-
- name: Set up Python 3.8
60-
uses: actions/setup-python@v1
61-
with:
62-
python-version: 3.8
63-
- name: Install dmenv
64-
uses: TankerHQ/dmenv-install-action@v1.0.0
65-
with:
66-
dmenv-version: 0.20.0
67-
- name: Prepare project for development
68-
run: dmenv install
69-
- name: Run tests
70-
run: dmenv run -- pytest --cov=tankersdk_identity --cov-report=xml --cov-report=term
7129
- name: Send coverage
72-
run: dmenv run -- codecov
30+
run: python -m poetry run codecov
7331
env:
7432
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

Changelog.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
1.2.2
2+
===
3+
4+
* Drop Python2 support
5+
* Drop Python 3.4 support
6+
17
1.2.1
28
===
39

0 commit comments

Comments
 (0)