Skip to content
This repository was archived by the owner on Jun 5, 2024. It is now read-only.

Small infrastructure updates #35

Merged
merged 4 commits into from
Oct 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ matrix:
env: PYTHON_VERSION=3.8
TOXENV=py38-test-pytest53

- language: python
python: 3.8
name: Python 3.8 and pytest 6.0 (Linux)
env: TOXENV=py38-test-pytest60

- os: osx
name: Python 3.8 and pytest dev (MacOS X)
env: PYTHON_VERSION=3.8
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["setuptools",
requires = ["setuptools>=30.3.0",
"setuptools_scm",
"wheel"]
build-backend = 'setuptools.build_meta'
3 changes: 3 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,6 @@ exclude =
[tool:pytest]
minversion = 4.6
testpaths = tests

[flake8]
max-line-length = 100
9 changes: 0 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
#!/usr/bin/env python

import os
import sys
import setuptools
from distutils.version import LooseVersion
from setuptools import setup

# Setuptools 30.3.0 or later is needed for setup.cfg options to be used
if LooseVersion(setuptools.__version__) < LooseVersion('30.3.0'):
sys.stderr.write("ERROR: sphinx-automodapi requires setuptools 30.3.0 or "
"later (found {0})".format(setuptools.__version__))
sys.exit(1)

setup(use_scm_version={'write_to': os.path.join('pytest_openfiles', 'version.py')})
1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ deps =
pytest51: pytest==5.1.*
pytest52: pytest==5.2.*
pytest53: pytest==5.3.*
pytest60: pytest==6.0.*
pytestdev: git+https://github.com/pytest-dev/pytest#egg=pytest

commands =
Expand Down