Merge ad162ef into ad67afa

qiime2 · Mar 23, 2017 · 95c1b08 · 95c1b08
2 parents ad67afa + ad162ef
commit 95c1b08
Show file tree

Hide file tree

Showing 9 changed files with 2,367 additions and 5 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -3,8 +3,12 @@ branch = True
 omit =
     */tests*
     */__init__.py
+    q2_types/_version.py
+    versioneer.py
 
 [report]
 omit =
     */tests*
     */__init__.py
+    q2_types/_version.py
+    versioneer.py
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+q2_types/_version.py export-subst
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,2 @@
+include versioneer.py
+include q2_types/_version.py
diff --git a/ci/recipe/meta.yaml b/ci/recipe/meta.yaml
@@ -1,6 +1,8 @@
+{% set data = load_setup_py_data() %}
+
 package:
   name: q2-types
-  version: "2017.3.0.dev0"
+  version: {{ data.get('version') }}
 
 source:
   path: ../..

diff --git a/q2_types/__init__.py b/q2_types/__init__.py
@@ -7,10 +7,11 @@
 # ----------------------------------------------------------------------------
 
 import importlib
-import pkg_resources
 
-__version__ = pkg_resources.get_distribution('q2-types').version
+from ._version import get_versions
 
+__version__ = get_versions()['version']
+del get_versions
 
 importlib.import_module('q2_types.feature_table')
 importlib.import_module('q2_types.distance_matrix')