Commit aa0f0ed3 authored by Barry Warsaw's avatar Barry Warsaw

* Remove distribute_setup.py since setuptools now does everything we want.

* Add a tox.ini for driving the test suite
* Rename README.txt -> README.rst
* Ignore some more stuff.
* Bump copyright years.
* Fix setup_helpers for utf-8.
* Update the template.
parent 05c9e859
build
dist
mailman.client.egg-info
.tox
__pycache__
*.egg-info
......@@ -41,9 +41,8 @@ Project details
You may download the latest version of the package from the Python
`Cheese Shop`_ or from Launchpad_.
You can also install it via ``easy_install`` or ``pip``.
You can also install it via ``pip``.
% sudo easy_install mailman.client
% sudo pip install mailman.client
See the Launchpad project page for access to the Bazaar branch, bug report,
......
This diff is collapsed.
# Copyright (C) 2010 by the Free Software Foundation, Inc.
# Copyright (C) 2010-2015 by the Free Software Foundation, Inc.
#
# This file is part of mailman.client.
#
......@@ -15,11 +15,8 @@
# You should have received a copy of the GNU Lesser General Public License
# along with mailman.client. If not, see <http://www.gnu.org/licenses/>.
import distribute_setup
distribute_setup.use_setuptools()
from setup_helpers import (
description, find_doctests, get_version, long_description, require_python)
description, find_doctests, long_description, require_python)
from setuptools import setup, find_packages
......@@ -34,7 +31,7 @@ setup(
include_package_data=True,
maintainer='Barry Warsaw',
maintainer_email='barry@list.org',
description=description('README.txt'),
description=description('README.rst'),
long_description=long_description(
'src/mailmanclient/README.txt',
'src/mailmanclient/NEWS.txt'),
......
# Copyright (C) 2009, 2010 by Barry A. Warsaw
# Copyright (C) 2009-2015 by the Free Software Foundation, Inc.
#
# This file is part of flufl.i18n
# This file is part of mailman.client
#
# flufl.i18n is free software: you can redistribute it and/or modify it under
# the terms of the GNU Lesser General Public License as published by the Free
# Software Foundation, version 3 of the License.
# mailman.client is free software: you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by the
# Free Software Foundation, version 3 of the License.
#
# flufl.i18n is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
# for more details.
# mailman.client is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
# details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with flufl.i18n. If not, see <http://www.gnu.org/licenses/>.
# along with mailman.client. If not, see <http://www.gnu.org/licenses/>.
"""setup.py helper functions."""
from __future__ import absolute_import, unicode_literals
from __future__ import print_function
from __future__ import absolute_import, print_function, unicode_literals
__metaclass__ = type
......@@ -33,6 +32,7 @@ __all__ = [
import os
import re
import sys
import codecs
DEFAULT_VERSION_RE = re.compile(r'(?P<version>\d+\.\d(?:\.\d+)?)')
......@@ -131,9 +131,10 @@ def long_description(*filenames):
"""Provide a long description."""
res = []
for value in filenames:
if value.endswith('.txt'):
with open(value) as fp:
value = fp.read().decode('UTF-8')
base, ext = os.path.splitext(value)
if ext in ('.txt', '.rst'):
with codecs.open(value, 'r', encoding='utf-8') as fp:
value = fp.read()
res.append(value)
if not value.endswith(NL):
res.append('')
......@@ -142,6 +143,6 @@ def long_description(*filenames):
def description(filename):
"""Provide a short description."""
with open(filename) as fp:
with codecs.open(filename, 'r', encoding='utf-8') as fp:
for line in fp:
return line.strip()
# Copyright (C) 2010 by the Free Software Foundation, Inc.
# Copyright (C) 2010-2015 by the Free Software Foundation, Inc.
#
# This file is part of mailman.client.
#
......
......@@ -4,7 +4,8 @@ NEWS for mailman.client
1.0.0b1 (xxxx-xx-xx)
* Addedd an improved test harness using WebTest. Contributed by Aurélien Bompard.
* Added an improved test harness using WebTest. Contributed by Aurélien
Bompard.
1.0.0a1 (2014-03-15)
......
# Copyright (C) 2010-2014 by the Free Software Foundation, Inc.
# Copyright (C) 2010-2015 by the Free Software Foundation, Inc.
#
# This file is part of mailman.client.
#
......
# Copyright (C) 2010-2014 by the Free Software Foundation, Inc.
# Copyright (C) 2010-2015 by the Free Software Foundation, Inc.
#
# This file is part of mailman.client.
#
......
# Copyright (C) 2010-2014 by The Free Software Foundation, Inc.
# Copyright (C) 2010-2015 by the Free Software Foundation, Inc.
#
# This file is part of mailman.client.
#
......
# Copyright (C) 2010-2014 by The Free Software Foundation, Inc.
# Copyright (C) 2010-2015 by the Free Software Foundation, Inc.
#
# This file is part of mailman.client.
#
......
# Copyright (C) 2010 by the Free Software Foundation, Inc.
# Copyright (C) 2010-2015 by the Free Software Foundation, Inc.
#
# This file is part of mailman.client.
#
......@@ -16,7 +16,7 @@
"""Module contents."""
from __future__ import absolute_import, unicode_literals
from __future__ import absolute_import, print_function, unicode_literals
__metaclass__ = type
__all__ = [
......
[tox]
envlist = py26,py27,py32,py33,py34
[testenv]
commands = python setup.py test
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment