Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
jaraco committed Oct 21, 2018
2 parents 4268620 + 106c755 commit 0a89a12
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 16 deletions.
2 changes: 2 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ ignore =
W191
# W503 violates spec https://github.com/PyCQA/pycodestyle/issues/513
W503
# W504 has issues https://github.com/OCA/maintainer-quality-tools/issues/545
W504
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
dist: trusty
dist: xenial
sudo: false
language: python

python:
- 2.7
- 3.4
- &latest_py3 3.6
- &latest_py3 3.7

jobs:
fast_finish: true
Expand All @@ -25,11 +25,15 @@ jobs:
secure: R5wfKa9o9Ah+j0++cY8D/aQI4zhLKWVT0Kctb1b4HQsPzZIJh3xJGsf4MJsmwUHDT18avf2e/f9Z2VAuq7RfsfT8C0LQ90tDUUNtW6vlCmGYldEpeN/O1PSCm1DI3mmFtpkIO2hN9MObYGhI9n7Q1ld7ReXdPUNMC2J3cRr7rmSMTGhxAABgcc0RO1eT6tHq4ZztCYO8UfLWUz09waiBXNWgnHzr/DGUTqnKD/EYL2tUiITJCRPJ8yKgaYyzGuPX65kXJSARMCuixdMJjo5oR5dk9oAwAw+hKmFV8maM3ae65d89NmwHF9svCB7noGgKAZbZmLe3RlC0xEx4tuhr5CP5FzXXrPutCPaUxjqj4Ld12Gl2XiBh0aJsqaPt5TPM0Khy5rQH7ZVZh/vTJ6TYTtfazRD2O/NrS59k6ooQH5Tg5eZ+KsrzPhiA1ANudvm3uENfWWjHv8gURnNso4mkOQYPku1I9M5GXjBE5Vwtahlw3ySUZvkMznBYVqLVB2wDt1LTHUvQ/JKmkdEl1o74x/ICwAhJ/aCJva4Txkf3P3P1u9uIktrJuQALA9u7jVS15W2jumXe6eXubJhrRyfcLjdYbmZSWpF5CpbVoOnxyWkFNSS8fSIngsDIAhgky+NpZthYXx0hMVi20ZZH1qxHgFLDnd7VusHZxNe0Rr3xrDA=
distributions: dists
skip_cleanup: true
skip_upload_docs: true

cache: pip

install:
- pip install tox tox-venv

before_script:
# Disable IPv6. Ref travis-ci/travis-ci#8361
- if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6';
fi
script: tox
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
),
replace=[
dict(
pattern=r'(Issue )?#(?P<issue>\d+)',
pattern=r'(Issue #|\B#)(?P<issue>\d+)',
url='{package_url}/issues/{issue}',
),
dict(
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build-system]
requires = ["setuptools", "wheel", "setuptools_scm>=1.15"]
requires = ["setuptools>=30.3", "wheel", "setuptools_scm>=1.15"]
3 changes: 3 additions & 0 deletions pytest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@
norecursedirs=dist build .tox .eggs
addopts=--doctest-modules --flake8
doctest_optionflags=ALLOW_UNICODE ELLIPSIS
filterwarnings=
ignore:Possible nested set::pycodestyle:113
ignore:Using or importing the ABCs::flake8:410
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[aliases]
release = dists upload
dists = clean --all sdist bdist_wheel

[bdist_wheel]
universal = 1

[metadata]
license_file = LICENSE
long_description = file:README.rst
8 changes: 1 addition & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,8 @@

# Project skeleton maintained at https://github.com/jaraco/skeleton

import io

import setuptools

with io.open('README.rst', encoding='utf-8') as readme:
long_description = readme.read()

name = 'irc'
description = 'IRC (Internet Relay Chat) protocol library for Python'
nspkg_technique = 'native'
Expand All @@ -25,7 +20,6 @@
maintainer="Jason R. Coombs",
maintainer_email="jaraco@jaraco.com",
description=description or name,
long_description=long_description,
url="https://github.com/jaraco/" + name,
packages=setuptools.find_packages(),
include_package_data=True,
Expand All @@ -49,7 +43,7 @@
extras_require={
'testing': [
# upstream
'pytest>=3.5',
'pytest>=3.5,!=3.7.3',
'pytest-sugar>=0.9.1',
'collective.checkdocs',
'pytest-flake8',
Expand Down
4 changes: 1 addition & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ minversion = 2.4
[testenv]
deps =
setuptools>=31.0.1
# workaround for yaml/pyyaml#126
# git+https://github.com/yaml/pyyaml@master#egg=pyyaml;python_version=="3.7"
commands =
py.test {posargs}
pytest {posargs}
python setup.py checkdocs
usedevelop = True
extras = testing
Expand Down

0 comments on commit 0a89a12

Please sign in to comment.