Merge pull request #729 from fjebaker/main

Move `astropy.samp` to `pyvo.astropy_samp`

Author: bsipocz

CHANGES.rst

@@ -7,6 +7,9 @@ Enhancements and Fixes
 - Provide an API for SoftId-compliant management of the 'User-Agent'
   header [#719]
 
+- The ``astropy.samp`` module has been relocated and is now accessible under
+  ``pyvo.samp`` [#729]
+
 
 Deprecations and Removals
 -------------------------

pyvo/samp/__init__.py

@@ -0,0 +1,40 @@
+# Licensed under a 3-clause BSD style license - see LICENSE.rst
+"""
+This subpackage provides classes to communicate with other applications via the
+`Simple Application Messaging Protocol (SAMP)
+<http://www.ivoa.net/documents/SAMP/>`_.
+
+Before integration into Astropy it was known as
+`SAMPy <https://pypi.org/project/sampy/>`_, and was developed by Luigi Paioro
+(INAF - Istituto Nazionale di Astrofisica).
+"""
+
+from astropy import config as _config
+
+from .client import *
+from .constants import *
+from .errors import *
+from .hub import *
+from .hub_proxy import *
+from .integrated_client import *
+from .utils import *
+from .vo_helpers import *
+
+
+class Conf(_config.ConfigNamespace):
+    """
+    Configuration parameters for `pyvo.samp`.
+    """
+
+    use_internet = _config.ConfigItem(
+        True,
+        "Whether to allow `pyvo.samp` to use the internet, if available.",
+        aliases=["pyvo.samp.utils.use_internet"],
+    )
+
+    n_retries = _config.ConfigItem(
+        10, "How many times to retry communications when they fail"
+    )
+
+
+conf = Conf()