Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix setuptools error #151

Merged
merged 6 commits into from
Mar 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: ci
name: Run tests

on: [push, pull_request]

Expand Down
90 changes: 0 additions & 90 deletions .github/workflows/conda-build.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/pypi-build.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: build
name: Build and publish

on: [push]

Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
7 changes: 3 additions & 4 deletions cdflib/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Loading