Skip to content

Commit dad3545

Browse files
authored
Merge pull request #61 from nicoddemus/release-2.0.0
2 parents 33221d7 + e407b23 commit dad3545

File tree

5 files changed

+15
-26
lines changed

5 files changed

+15
-26
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,16 @@ jobs:
5353
strategy:
5454
fail-fast: false
5555
matrix:
56-
python: ["3.6", "3.7", "3.8"]
56+
python: ["3.6", "3.7", "3.8", "3.9"]
5757
include:
5858
- python: "3.6"
5959
tox_env: "py36-pytestlatest"
6060
- python: "3.7"
6161
tox_env: "py37-pytestlatest"
6262
- python: "3.8"
63-
tox_env: "py38-pytestlatest py38-pytest53"
63+
tox_env: "py38-pytestlatest"
64+
- python: "3.9"
65+
tox_env: "py39-pytestlatest py39-pytest53"
6466

6567
steps:
6668
- uses: actions/checkout@v1
@@ -81,31 +83,13 @@ jobs:
8183
run: |
8284
tox -e ${{ matrix.tox_env }}
8385
84-
linting:
85-
86-
runs-on: ubuntu-latest
87-
88-
steps:
89-
- uses: actions/checkout@v1
90-
- name: Set up Python
91-
uses: actions/setup-python@v1
92-
with:
93-
python-version: "3.7"
94-
- name: Install tox
95-
run: |
96-
python -m pip install --upgrade pip
97-
pip install tox
98-
- name: Linting
99-
run: |
100-
tox -e linting
101-
10286
deploy:
10387

10488
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
10589

10690
runs-on: ubuntu-latest
10791

108-
needs: [test, linting]
92+
needs: test
10993

11094
steps:
11195
- uses: actions/checkout@v1

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# 2.0.0
2+
3+
- `pytest-cpp` now supports [Catch2](https://github.com/catchorg/Catch2). Many thanks to [@salim-runsafe](https://github.com/salim-runsafe) for the contribution.
4+
5+
- Dropped support for Python 2.7 and 3.5.
6+
17
# 1.5.0
28

39
- Added support for `GTEST_SKIP()` from Google Test 1.10.

setup.cfg

Lines changed: 0 additions & 2 deletions
This file was deleted.

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
keywords="pytest test unittest",
2020
url="http://github.com/pytest-dev/pytest-cpp",
2121
classifiers=[
22-
"Development Status :: 4 - Beta",
22+
"Development Status :: 5 - Production/Stable",
2323
"Framework :: Pytest",
2424
"Intended Audience :: Developers",
2525
"License :: OSI Approved :: MIT License",
@@ -28,6 +28,7 @@
2828
"Programming Language :: Python :: 3.6",
2929
"Programming Language :: Python :: 3.7",
3030
"Programming Language :: Python :: 3.8",
31+
"Programming Language :: Python :: 3.9",
3132
"Programming Language :: C++",
3233
"Topic :: Software Development :: Quality Assurance",
3334
"Topic :: Software Development :: Testing",

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py{36,37,38}-pytestlatest,py38-pytest53
2+
envlist = py{36,37,38,39}-pytestlatest,py39-pytest53
33

44
[testenv]
55
deps=
@@ -11,7 +11,7 @@ deps=
1111
coverage
1212
commands=
1313
pytest tests
14-
pytest -n8 tests
14+
pytest -n2 tests
1515

1616
[testenv:linting]
1717
skipsdist = True

0 commit comments

Comments
 (0)