Skip to content

Commit a06deb5

Browse files
committed
Update maintainer info
This reverts commit f38dcc0 and also adds information about the new maintainers, @coordt and @diazona (me).
1 parent f38dcc0 commit a06deb5

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

AUTHORS

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@ Sebastian Rahlf <[email protected]> (maintainer)
22
Muhammad Hallaj Subery <[email protected]>
33
Thomas Weißschuh <[email protected]>
44
Benjamin Wohlwend <[email protected]>
5-
Jason R. Coombs
5+
Jason R. Coombs
6+
David Zaslavsky <[email protected]> (maintainer)
7+
Corey Oordt <[email protected]> (maintainer)

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2011, Sebastian Rahlf
1+
Copyright (c) 2011-2021, Sebastian Rahlf and contributors
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy of
44
this software and associated documentation files (the "Software"), to deal in

README

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
At the moment this package is not actively maintained and its future is somewhat
2-
uncertain. If you would be interested in maintaining or co-maintaining it,
3-
please contribute to the discussion at
4-
https://github.com/pytest-dev/pytest/issues/7857.
5-
61
==================
72
pytest-localserver
83
==================
@@ -82,10 +77,10 @@ poking around in the code itself.
8277
* ``headers`` - response headers (dict)
8378

8479
Once these attribute are set, all subsequent requests will be answered with
85-
these values until they are changed or the server is stopped. A more
80+
these values until they are changed or the server is stopped. A more
8681
convenient way to change these is ::
8782

88-
httpserver.serve_content(content=None, code=200, headers=None)
83+
httpserver.serve_content(content=None, code=200, headers=None)
8984

9085
The server address can be found in property
9186

@@ -162,12 +157,12 @@ License and Credits
162157
This plugin is released under the MIT license. You can find the full text of
163158
the license in the LICENSE file.
164159

165-
Copyright (C) 2010-2013 Sebastian Rahlf and others (see AUTHORS).
160+
Copyright (C) 2010-2021 Sebastian Rahlf and others (see AUTHORS).
166161

167162
Some parts of this package is based on ideas or code from other people:
168163

169164
- I borrowed some implementation ideas for the httpserver from `linkchecker`_.
170-
- The implementation for the SMTP server is based on the `Mailsink recipe`_ by
165+
- The implementation for the SMTP server is based on the `Mailsink recipe`_ by
171166
Adam Feuer, Matt Branthwaite and Troy Frever.
172167
- The HTTPS implementation is based on work by `Sebastien Martini`_.
173168

@@ -196,7 +191,7 @@ I already have a couple of ideas for future versions:
196191

197192
.. [1] The idea for this project was born when I needed to check that `a piece
198193
of software`_ behaved itself when receiving HTTP error codes 404 and 500.
199-
Having unsuccessfully tried to mock a server, I stumbled across
194+
Having unsuccessfully tried to mock a server, I stumbled across
200195
`linkchecker`_ which uses a the same idea to test its internals.
201196

202197
.. _monkeypatching: http://pytest.org/latest/monkeypatch.html

setup.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ def run(self):
3333
version=VERSION,
3434
author='Sebastian Rahlf',
3535
author_email='[email protected]',
36+
maintainer='David Zaslavsky',
37+
maintainer_email='[email protected]',
3638
license='MIT License',
3739
description='py.test plugin to test server connections locally.',
3840
long_description=read('README'),

0 commit comments

Comments
 (0)