Permalink
Browse files

Merge pull request #3431 from scottpurdy/nupic-research-bindings

Allow nupic.research.bindings instead of nupic.bindings
  • Loading branch information...
2 parents 6774f1a + e05a775 commit f8ddfded046e81b18e76a1e508c1510ac18c5a7f @scottpurdy scottpurdy committed on GitHub Dec 19, 2016
Showing with 9 additions and 1 deletion.
  1. +9 −1 setup.py
View
@@ -1,6 +1,6 @@
# ----------------------------------------------------------------------
# Numenta Platform for Intelligent Computing (NuPIC)
-# Copyright (C) 2015, Numenta, Inc. Unless you have an agreement
+# Copyright (C) 2016, Numenta, Inc. Unless you have an agreement
# with Numenta, Inc., for a separate license for this software code, the
# following terms and conditions apply:
#
@@ -59,6 +59,14 @@ def nupicBindingsPrereleaseInstalled():
pass # Silently ignore. The absence of nupic.bindings will be handled by
# setuptools by default
+ # Also check for nupic.research.bindings
+ try:
+ nupicDistribution = pkg_resources.get_distribution("nupic.research.bindings")
+ return True
+ except pkg_resources.DistributionNotFound:
+ pass # Silently ignore. The absence of nupic.bindings will be handled by
+ # setuptools by default
+
return False

0 comments on commit f8ddfde

Please sign in to comment.