launchpad-reviewers team mailing list archive

[Colin Watson <mp+430848@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/python-oops-amqp/modernize-setup into lp:python-oops-amqp with lp:~cjwatson/python-oops-amqp/tox as a prerequisite.

Commit message:
Switch to declarative setup.cfg.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/python-oops-amqp/modernize-setup/+merge/430848
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/python-oops-amqp/modernize-setup into lp:python-oops-amqp.

=== modified file 'NEWS'
--- NEWS	2022-09-30 22:52:28 +0000
+++ NEWS	2022-09-30 22:52:28 +0000
@@ -7,6 +7,7 @@
 -----
 
 - Switch from buildout to tox. (Colin Watson)
+- Switch to declarative setup.cfg. (Colin Watson)
 
 0.1.0
 -----

=== added file 'setup.cfg'
--- setup.cfg	1970-01-01 00:00:00 +0000
+++ setup.cfg	2022-09-30 22:52:28 +0000
@@ -0,0 +1,42 @@
+# Copyright 2011-2022 Canonical Ltd.  This software is licensed under the
+# GNU General Public License version 3 (see the file LICENSE).
+
+[metadata]
+name = oops_amqp
+version = 0.1.0
+description = OOPS AMQP transport.
+long_description = file: README
+long_description_content_type = text/plain
+url = https://launchpad.net/python-oops-amqp
+maintainer = Launchpad Developers
+maintainer_email = launchpad-dev@xxxxxxxxxxxxxxxxxxx
+license = LGPL-3.0
+license_file = LICENSE
+classifiers =
+    Development Status :: 2 - Pre-Alpha
+    Intended Audience :: Developers
+    License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)
+    License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)
+    Operating System :: OS Independent
+    Programming Language :: Python
+    Programming Language :: Python :: 2
+    Programming Language :: Python :: 3
+
+[options]
+packages = oops_amqp
+install_requires =
+    amqp>=2.0.0
+    bson
+    oops>=0.0.11
+package_dir = =.
+
+[options.entry_points]
+console_scripts =
+    oops-amqp-trace = oops_amqp.trace:main
+
+[options.extras_require]
+test =
+    rabbitfixture
+    six
+    testresources
+    testtools

=== modified file 'setup.py'
--- setup.py	2018-05-09 12:31:40 +0000
+++ setup.py	2022-09-30 22:52:28 +0000
@@ -1,61 +1,6 @@
-#!/usr/bin/env python
-#
-# Copyright (c) 2011, Canonical Ltd
-#
-# This program 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 only.
-#
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-# GNU Lesser General Public License version 3 (see the file LICENSE).
-
-
-from distutils.core import setup
-import os.path
-
-with open(os.path.join(os.path.dirname(__file__), 'README')) as f:
-    description = f.read()
-
-setup(name="oops_amqp",
-      version="0.1.0",
-      description=\
-              "OOPS AMQP transport.",
-      long_description=description,
-      maintainer="Launchpad Developers",
-      maintainer_email="launchpad-dev@xxxxxxxxxxxxxxxxxxx",
-      url="https://launchpad.net/python-oops-amqp";,
-      packages=['oops_amqp'],
-      package_dir = {'':'.'},
-      classifiers = [
-          'Development Status :: 2 - Pre-Alpha',
-          'Intended Audience :: Developers',
-          'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
-          'Operating System :: OS Independent',
-          'Programming Language :: Python',
-          'Programming Language :: Python :: 2',
-          'Programming Language :: Python :: 3',
-          ],
-      install_requires = [
-          'bson',
-          'oops>=0.0.11',
-          'amqp>=2.0.0',
-          ],
-      extras_require = dict(
-          test=[
-              'rabbitfixture',
-              'six',
-              'testresources',
-              'testtools',
-              ]
-          ),
-        entry_points=dict(
-            console_scripts=[ # `console_scripts` is a magic name to setuptools
-                'oops-amqp-trace = oops_amqp.trace:main',
-                ]),
-      )
+# Copyright 2022 Canonical Ltd.  This software is licensed under the
+# GNU General Public License version 3 (see the file LICENSE).
+
+from setuptools import setup
+
+setup()