python-oops-amqp

Merge lp:~cjwatson/python-oops-amqp/modernize-setup into lp:python-oops-amqp

  1. modernize-setup
  2. Merge into trunk
Proposed by Colin Watson
Status: Merged
Merged at revision: 25
Proposed branch: lp:~cjwatson/python-oops-amqp/modernize-setup
Merge into: lp:python-oops-amqp
Prerequisite: lp:~cjwatson/python-oops-amqp/tox
Diff against target: 128 lines (+47/-59)
3 files modified
NEWS (+1/-0)
setup.cfg (+42/-0)
setup.py (+4/-59)
To merge this branch: bzr merge lp:~cjwatson/python-oops-amqp/modernize-setup
Reviewer Review Type Date Requested Status
Guruprasad Approve
Review via email: mp+430848@code.launchpad.net

Commit message

Switch to declarative setup.cfg.

To post a comment you must log in.
lp:~cjwatson/python-oops-amqp/modernize-setup updated
26. By Colin Watson

Switch to declarative setup.cfg.

Revision history for this message
Guruprasad (lgp171188) wrote :

LGTM 👍

review: Approve
Revision history for this message
Guruprasad (lgp171188) wrote :

> 25. Update .bzrignore.
>
> 24. Switch from buildout to tox.

I am not sure why I see only the changes in revision 26 and not the above revisions even though they are listed under 'Unmerged revisions'. 🤔

Revision history for this message
Colin Watson (cjwatson) wrote :

Because those revisions were part of the prerequisite branch.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2022-09-30 22:54:07 +0000
3+++ NEWS 2022-09-30 22:54:07 +0000
4@@ -7,6 +7,7 @@
5 -----
6
7 - Switch from buildout to tox. (Colin Watson)
8+- Switch to declarative setup.cfg. (Colin Watson)
9
10 0.1.0
11 -----
12
13=== added file 'setup.cfg'
14--- setup.cfg 1970-01-01 00:00:00 +0000
15+++ setup.cfg 2022-09-30 22:54:07 +0000
16@@ -0,0 +1,42 @@
17+# Copyright 2011-2022 Canonical Ltd. This software is licensed under the
18+# GNU Lesser General Public License version 3 (see the file LICENSE).
19+
20+[metadata]
21+name = oops_amqp
22+version = 0.1.0
23+description = OOPS AMQP transport.
24+long_description = file: README
25+long_description_content_type = text/plain
26+url = https://launchpad.net/python-oops-amqp
27+maintainer = Launchpad Developers
28+maintainer_email = launchpad-dev@lists.launchpad.net
29+license = LGPL-3.0
30+license_file = LICENSE
31+classifiers =
32+ Development Status :: 2 - Pre-Alpha
33+ Intended Audience :: Developers
34+ License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)
35+ License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)
36+ Operating System :: OS Independent
37+ Programming Language :: Python
38+ Programming Language :: Python :: 2
39+ Programming Language :: Python :: 3
40+
41+[options]
42+packages = oops_amqp
43+install_requires =
44+ amqp>=2.0.0
45+ bson
46+ oops>=0.0.11
47+package_dir = =.
48+
49+[options.entry_points]
50+console_scripts =
51+ oops-amqp-trace = oops_amqp.trace:main
52+
53+[options.extras_require]
54+test =
55+ rabbitfixture
56+ six
57+ testresources
58+ testtools
59
60=== modified file 'setup.py'
61--- setup.py 2018-05-09 12:31:40 +0000
62+++ setup.py 2022-09-30 22:54:07 +0000
63@@ -1,61 +1,6 @@
64-#!/usr/bin/env python
65-#
66-# Copyright (c) 2011, Canonical Ltd
67-#
68-# This program is free software: you can redistribute it and/or modify
69-# it under the terms of the GNU Lesser General Public License as published by
70-# the Free Software Foundation, version 3 only.
71-#
72-# This program is distributed in the hope that it will be useful,
73-# but WITHOUT ANY WARRANTY; without even the implied warranty of
74-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
75-# GNU Lesser General Public License for more details.
76-#
77-# You should have received a copy of the GNU Lesser General Public License
78-# along with this program. If not, see <http://www.gnu.org/licenses/>.
79+# Copyright 2022 Canonical Ltd. This software is licensed under the
80 # GNU Lesser General Public License version 3 (see the file LICENSE).
81
82-
83-from distutils.core import setup
84-import os.path
85-
86-with open(os.path.join(os.path.dirname(__file__), 'README')) as f:
87- description = f.read()
88-
89-setup(name="oops_amqp",
90- version="0.1.0",
91- description=\
92- "OOPS AMQP transport.",
93- long_description=description,
94- maintainer="Launchpad Developers",
95- maintainer_email="launchpad-dev@lists.launchpad.net",
96- url="https://launchpad.net/python-oops-amqp",
97- packages=['oops_amqp'],
98- package_dir = {'':'.'},
99- classifiers = [
100- 'Development Status :: 2 - Pre-Alpha',
101- 'Intended Audience :: Developers',
102- 'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
103- 'Operating System :: OS Independent',
104- 'Programming Language :: Python',
105- 'Programming Language :: Python :: 2',
106- 'Programming Language :: Python :: 3',
107- ],
108- install_requires = [
109- 'bson',
110- 'oops>=0.0.11',
111- 'amqp>=2.0.0',
112- ],
113- extras_require = dict(
114- test=[
115- 'rabbitfixture',
116- 'six',
117- 'testresources',
118- 'testtools',
119- ]
120- ),
121- entry_points=dict(
122- console_scripts=[ # `console_scripts` is a magic name to setuptools
123- 'oops-amqp-trace = oops_amqp.trace:main',
124- ]),
125- )
126+from setuptools import setup
127+
128+setup()

Subscribers

People subscribed via source and target branches

to all changes: