Merge pull request #151 from dstansby/master

Fix setuptools error

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: ci
+name: Run tests
 
 on: [push, pull_request]
 

.github/workflows/pypi-build.yaml

@@ -1,4 +1,4 @@
-name: build
+name: Build and publish
 
 on: [push]
 

.readthedocs.yml

@@ -26,4 +26,4 @@ sphinx:
 # Optionally declare the Python requirements required to build your docs
 python:
    install:
-   - requirements: doc/requirements.txt
+   - requirements: doc/requirements.txt

README.md

@@ -1,5 +1,5 @@
-[![image](https://coveralls.io/repos/github/MAVENSDC/cdflib/badge.svg?branch=master)](https://coveralls.io/github/MAVENSDC/cdflib?branch=master)
 [![Actions Status](https://github.com/MAVENSDC/cdflib/workflows/ci/badge.svg)](https://github.com/MAVENSDC/cdflib/actions)
+[![codecov](https://codecov.io/gh/MAVENSDC/cdflib/branch/master/graph/badge.svg?token=IJ6moGc40e)](https://codecov.io/gh/MAVENSDC/cdflib)
 [![DOI](https://zenodo.org/badge/102912691.svg)](https://zenodo.org/badge/latestdoi/102912691)
 [![Documentation Status](https://readthedocs.org/projects/cdflib/badge/?version=latest)](https://cdflib.readthedocs.io/en/latest/?badge=latest)
 

cdflib/__init__.py

@@ -2,20 +2,19 @@
 
 from . import cdfread, cdfwrite
 from .cdf_factory import CDF
-
 from .epochs import CDFepoch as cdfepoch  # noqa: F401
 
 try:
     # This is an optional dependency for astropy time conversions
     from .epochs_astropy import CDFAstropy as cdfastropy
-except:
+except BaseException:
     pass
 
 try:
     # Another optional dependency for XArray <-> cdf conversions
-    from .xarray_to_cdf import xarray_to_cdf
     from .cdf_to_xarray import cdf_to_xarray
-except:
+    from .xarray_to_cdf import xarray_to_cdf
+except BaseException:
     pass
 
 __all__ = ['CDF', 'xarray_to_cdf', 'cdf_to_xarray']