Merge pull request #3 from pytest-dev/update-package-info/1/dev

Update package info to reflect migration to Github

Author: diazona

AUTHORS

@@ -2,4 +2,6 @@ Sebastian Rahlf <[email protected]> (maintainer)
 Muhammad Hallaj Subery <[email protected]>
 Thomas Weißschuh <[email protected]>
 Benjamin Wohlwend <[email protected]>
-Jason R. Coombs
+Jason R. Coombs
+David Zaslavsky <[email protected]> (maintainer)
+Corey Oordt <[email protected]> (maintainer)

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011, Sebastian Rahlf
+Copyright (c) 2011-2021, Sebastian Rahlf and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

MANIFEST.in

@@ -1,6 +1,6 @@
 include LICENSE
 include MANIFEST.in
-include README
+include README.rst
 include pytest_localserver/server.*
 include pytest_localserver/ca.*
 recursive-include tests *.py

README renamed to README.rst

@@ -1,8 +1,3 @@
-At the moment this package is not actively maintained and its future is somewhat
-uncertain. If you would be interested in maintaining or co-maintaining it,
-please contribute to the discussion at
-https://github.com/pytest-dev/pytest/issues/7857.
-
 ==================
 pytest-localserver
 ==================
@@ -82,10 +77,10 @@ poking around in the code itself.
     * ``headers`` - response headers (dict)
 
     Once these attribute are set, all subsequent requests will be answered with
-    these values until they are changed or the server is stopped. A more 
+    these values until they are changed or the server is stopped. A more
     convenient way to change these is ::
 
-        httpserver.serve_content(content=None, code=200, headers=None) 
+        httpserver.serve_content(content=None, code=200, headers=None)
 
     The server address can be found in property
 
@@ -162,12 +157,12 @@ License and Credits
 This plugin is released under the MIT license. You can find the full text of
 the license in the LICENSE file.
 
-Copyright (C) 2010-2013 Sebastian Rahlf and others (see AUTHORS).
+Copyright (C) 2010-2021 Sebastian Rahlf and others (see AUTHORS).
 
 Some parts of this package is based on ideas or code from other people:
 
 - I borrowed some implementation ideas for the httpserver from `linkchecker`_.
-- The implementation for the SMTP server is based on the `Mailsink recipe`_ by 
+- The implementation for the SMTP server is based on the `Mailsink recipe`_ by
   Adam Feuer, Matt Branthwaite and Troy Frever.
 - The HTTPS implementation is based on work by `Sebastien Martini`_.
 
@@ -196,7 +191,7 @@ I already have a couple of ideas for future versions:
 
 .. [1] The idea for this project was born when I needed to check that `a piece
        of software`_ behaved itself when receiving HTTP error codes 404 and 500.
-       Having unsuccessfully tried to mock a server, I stumbled across 
+       Having unsuccessfully tried to mock a server, I stumbled across
        `linkchecker`_ which uses a the same idea to test its internals.
 
 .. _monkeypatching: http://pytest.org/latest/monkeypatch.html

pytest_localserver/http.py

@@ -121,7 +121,7 @@ def serve_content(self, content, code=200, headers=None):
         path = sys.argv[1]
     except IndexError:
         path = os.path.join(
-            os.path.dirname(os.path.abspath(__file__)), '..', 'README')
+            os.path.dirname(os.path.abspath(__file__)), '..', 'README.rst')
 
     app.serve_content(open(path).read(), 302)
 

pytest_localserver/https.py

@@ -89,7 +89,7 @@ class SecureContentServer (ContentServer):
 
     A more advanced tutorial can be found `here`_.
 
-    .. _pytest-localserver CA: https://bitbucket.org/pytest-dev/pytest-localserver/src/tip/pytest_localserver/ca.crt
+    .. _pytest-localserver CA: https://raw.githubusercontent.com/pytest-dev/pytest-localserver/master/pytest_localserver/ca.crt
     .. _pyOpenSSH: https://launchpad.net/pyopenssl
     """
 
@@ -121,7 +121,7 @@ def __init__(self, host='localhost', port=0,
         path = sys.argv[1]
     except IndexError:
         path = os.path.join(
-            os.path.dirname(os.path.abspath(__file__)), '..', 'README')
+            os.path.dirname(os.path.abspath(__file__)), '..', 'README.rst')
 
     server.serve_content(open(path).read(), 302)
 

setup.cfg

@@ -1,3 +1,3 @@
 
 [metadata]
-description-file = README
+description-file = README.rst

setup.py

@@ -33,11 +33,12 @@ def run(self):
     version=VERSION,
     author='Sebastian Rahlf',
     author_email='[email protected]',
+    maintainer='David Zaslavsky',
+    maintainer_email='[email protected]',
     license='MIT License',
     description='py.test plugin to test server connections locally.',
-    long_description=read('README'),
-    url='http://bitbucket.org/pytest-dev/pytest-localserver/',
-    download_url='http://bitbucket.org/pytest-dev/pytest-localserver/downloads/',
+    long_description=read('README.rst'),
+    url='https://github.com/pytest-dev/pytest-localserver',
 
     packages=['pytest_localserver'],
     install_requires=[