Merge pull request #18 from kthyng/main

updates
axiom-data-science · Jan 28, 2023 · 476d7e3 · 476d7e3
2 parents 775eec4 + a1acab1
commit 476d7e3
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 15 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/setup-python@v4
       - name: Install dependencies
         run: |
-          python -m pip install -U pip wheel setuptools setuptools-scm twine
+          python -m pip install -U pip wheel "setuptools<66.0.0" setuptools-scm twine
       - name: Build distributions
         run: python setup.py sdist bdist_wheel
 

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -30,7 +30,8 @@ jobs:
           key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('ci/environment-py${{ matrix.python-version }}.yml') }}
       - uses: conda-incubator/setup-miniconda@v2
         with:
-          mamba-version: "*" # activate this to build with mamba.
+          python-version: ${{ matrix.python-version }}
+          miniforge-variant: Mambaforge
           channels: conda-forge, defaults # These need to be specified to use mamba
           channel-priority: true
           environment-file: ci/environment-py${{ matrix.python-version }}.yml

diff --git a/docs/conf.py b/docs/conf.py
@@ -26,17 +26,17 @@
 # -- Project information -----------------------------------------------------
 
 project = "intake-axds"
-copyright = "2022, Axiom Data Science"
+copyright = "2022–2023, Axiom Data Science"
 author = "Axiom Data Science"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 # see https://pypi.org/project/setuptools-scm/ for details
-from pkg_resources import get_distribution
+from importlib.metadata import version as imversion
 
 
-release = get_distribution("intake_axds").version
+release = imversion("intake-axds")
 # for example take major/minor
 version = ".".join(release.split(".")[:2])
 

diff --git a/docs/index.rst b/docs/index.rst
@@ -9,23 +9,29 @@ Welcome to intake-axds's documentation!
 Installation
 ------------
 
+To install from conda-forge:
+
+  >>> conda install -c intake-axds
+
 To install from PyPI:
   >>> pip install intake-axds
 
 .. toctree::
    :maxdepth: 2
+   :hidden:
+   :caption: User Documentation
 
    demo_overview.md
    api
    GitHub repository <https://github.com/axiom-data-science/intake-axds>
 
 
 
-Indices and tables
-==================
+.. Indices and tables
+.. ==================
 
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
+.. * :ref:`genindex`
+.. * :ref:`modindex`
+.. * :ref:`search`
 
-.. _reStructuredText: https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html
+.. .. _reStructuredText: https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html
diff --git a/intake_axds/utils.py b/intake_axds/utils.py
@@ -1,21 +1,20 @@
 """Utils to run."""
 
+from importlib.metadata import PackageNotFoundError, version
 from typing import Optional
 
 import cf_pandas as cfp
 import requests
 
-from pkg_resources import DistributionNotFound, get_distribution
-
 
 search_headers = {"Accept": "application/json"}
 
 
 def _get_version() -> str:
     """Fixes circular import issues."""
     try:
-        __version__ = get_distribution("intake-axds").version
-    except DistributionNotFound:
+        __version__ = version("ocean-model-skill-assessor")
+    except PackageNotFoundError:
         # package is not installed
         __version__ = "unknown"