Skip to content

Commit

Permalink
Merge 6a5a542 into 0478e6b
Browse files Browse the repository at this point in the history
  • Loading branch information
mgedmin committed May 28, 2019
2 parents 0478e6b + 6a5a542 commit f8fad44
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 13 deletions.
9 changes: 2 additions & 7 deletions .travis.yml
@@ -1,17 +1,12 @@
language: python
sudo: false
dist: xenial
python:
- 2.7
- 3.4
- 3.5
- 3.6
- 3.7
- pypy
- pypy3
matrix:
include:
- python: "3.7"
dist: xenial
sudo: true
install:
- pip install -U pip setuptools
- pip install -U coverage coveralls
Expand Down
4 changes: 2 additions & 2 deletions CHANGES.rst
Expand Up @@ -2,10 +2,10 @@
Changes
=========

4.3.1 (unreleased)
4.4.0 (unreleased)
==================

- Nothing changed yet.
- Drop support for Python 3.4.


4.3.0 (2018-10-05)
Expand Down
7 changes: 5 additions & 2 deletions setup.py
Expand Up @@ -16,12 +16,15 @@
import os
from setuptools import setup, find_packages


def read(*rnames):
with open(os.path.join(os.path.dirname(__file__), *rnames)) as f:
return f.read()


long_description = (read('README.rst') + '\n\n' + read('CHANGES.rst'))


def alltests():
import sys
import unittest
Expand All @@ -36,6 +39,7 @@ def alltests():
suites = list(zope.testrunner.find.find_suites(options))
return unittest.TestSuite(suites)


TESTS_REQUIRE = [
'zope.browsermenu',
'zope.testing',
Expand All @@ -44,7 +48,7 @@ def alltests():

setup(
name='zope.browserpage',
version='4.3.1.dev0',
version='4.4.0.dev0',
url='https://github.com/zopefoundation/zope.browserpage',
author='Zope Foundation and Contributors',
author_email='zope-dev@zope.org',
Expand All @@ -56,7 +60,6 @@ def alltests():
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
@@ -1,6 +1,6 @@
[tox]
envlist =
py27,pypy,py34,py35,py36,py37,pypy3,coverage
py27,py35,py36,py37,pypy,pypy3,coverage

[testenv]
commands =
Expand All @@ -13,7 +13,7 @@ deps =
usedevelop = true
commands =
coverage run -m zope.testrunner --test-path=src []
coverage report --fail-under=100
coverage report --fail-under=100 -m
deps =
{[testenv]deps}
coverage

0 comments on commit f8fad44

Please sign in to comment.