Merge branch 'master' into azure

Author: nicolocin

.circleci/config.yml

@@ -49,7 +49,7 @@ jobs:
           command: pip install --no-cache-dir -r docs/requirements.txt
       - run:
           name: Build only this commit
-          command: make -C docs SPHINXOPTS="-W" BUILDDIR="_build/no_version_html" html
+          command: make -C docs SPHINXOPTS="-W" BUILDDIR="_build/no_version_html" SPHINX_APIDOC_OPTIONS="members,undoc-members,show-inheritance,noindex" html
       - store_artifacts:
           path: ./docs/_build/no_version_html
       - run:

LICENSE

@@ -11,4 +11,3 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-

min-requirements.txt

@@ -2,4 +2,4 @@
 attrs
 cloudpickle == 0.8.0
 filelock == 3.0.0
-etelemetry
+etelemetry == 0.2.0

pydra/__init__.py

@@ -5,6 +5,9 @@
 first-class operations. It forms the core of the Nipype 2.0 ecosystem.
 
 """
+import logging
+
+logger = logging.getLogger("pydra")
 from ._version import get_versions
 
 __version__ = get_versions()["version"]
@@ -14,54 +17,10 @@
 from . import mark
 
 
-def check_latest_version(raise_exception=False):
-    """
-    Check for the latest version of the library.
-
-    Parameters
-    ----------
-    raise_exception: :obj:`bool`
-        Raise a RuntimeError if a bad version is being used
-
-    """
+def check_latest_version():
     import etelemetry
-    import logging
-    from pkg_resources import parse_version
-
-    logger = logging.getLogger("pydra")
-
-    INIT_MSG = "Running {packname} version {version} (latest: {latest})".format
 
-    latest = {"version": "Unknown", "bad_versions": []}
-    result = None
-    try:
-        result = etelemetry.get_project("nipype/pydra")
-    except Exception as e:
-        logger.warning("Could not check for version updates: \n%s", e)
-    finally:
-        if result:
-            latest.update(**result)
-            if parse_version(__version__) != parse_version(latest["version"]):
-                logger.info(
-                    INIT_MSG(
-                        packname="pydra", version=__version__, latest=latest["version"]
-                    )
-                )
-            if latest["bad_versions"] and any(
-                [
-                    parse_version(__version__) == parse_version(ver)
-                    for ver in latest["bad_versions"]
-                ]
-            ):
-                message = (
-                    "You are using a version of Pydra with a critical "
-                    "bug. Please use a different version."
-                )
-                if raise_exception:
-                    raise RuntimeError(message)
-                else:
-                    logger.critical(message)
-    return latest
+    return etelemetry.check_available_version("nipype/pydra", __version__, lgr=logger)
 
 
 # Run telemetry on import for interactive sessions, such as IPython, Jupyter notebooks, Python REPL

setup.cfg

@@ -26,7 +26,7 @@ install_requires =
     attrs
     cloudpickle >= 0.8.0
     filelock >= 3.0.0
-    etelemetry
+    etelemetry >= 0.2.0
 
 test_requires =
     pytest >= 4.4.0