Skip to content
Browse files

Packaging tweaks.

  • Loading branch information...
1 parent d0234cb commit d397ccef9246885ee67f63be755d4286f310a2da @kwgoodman committed Jun 24, 2010
Showing with 7 additions and 32 deletions.
  1. +1 −0 MANIFEST.in
  2. +0 −26 doc/launchpad.txt
  3. +2 −2 la/flabel.py
  4. +4 −4 setup.py
View
1 MANIFEST.in
@@ -1,3 +1,4 @@
include ChangeLog LICENSE README.rst RELEASE.rst la/LICENSE
+include la/src/setup.py la/src/cflabel.pyx
recursive-include doc *
recursive-exclude doc/build *
View
26 doc/launchpad.txt
@@ -1,26 +0,0 @@
-Label the rows, columns, any dimension, of your NumPy arrays.
-
-The main class of the la package is a labeled array, larry. A larry consists
-of data and labels. The data is stored as a NumPy array and the labels as a
-list of lists (one list per dimension).
-
-Alignment by label is automatic when you add (or subtract, multiply, divide)
-two larrys.
-
-larry has built-in methods such as movingsum, ranking, merge, shuffle,
-zscore, demean, lag as well as typical Numpy methods like sum, max, std,
-sign, clip. NaNs are treated as missing data.
-
-You can archive larrys in HDF5 format using save and load or using a
-dictionary-like interface.
-
-larry adds the convenience of labels, provides many built-in methods, and
-let's you use many of your existing NumPy array functions.
-
-docs http://larry.sourceforge.net
-code https://code.launchpad.net/~kwgoodman/larry/trunk
-mail http://groups.google.ca/group/pystatsmodels
-
-Development mailing list:
-mail: larry-discuss@lists.launchpad.net
-archive: http://lists.launchpad.net/larry-discuss
View
4 la/flabel.py
@@ -6,7 +6,7 @@
try:
# The c version is faster...
- from la.util.cflabel import listmap
+ from la.cflabel import listmap
except ImportError:
# ...but perhaps it did not compile when you built the la package? So
# we'll use the python version. If you are unsure which version you are
@@ -83,7 +83,7 @@ def listmap(list1, list2, ignore_unmappable=False):
try:
# The c version is faster...
- from la.util.cflabel import listmap_fill
+ from la.cflabel import listmap_fill
except ImportError:
# ...but perhaps it did not compile when you built the la package? So
# we'll use the python version. If you are unsure which version you are
View
8 setup.py
@@ -118,8 +118,8 @@
MICRO = VER[2]
ISRELEASED = False
VERSION = '%s.%s.%s' % (MAJOR, MINOR, MICRO)
-PACKAGES = ["la", "la/tests", "la/util", "la/util/tests", "la/src"]
-PACKAGE_DATA = {'la': ['LICENSE'], 'la/src': ['cflabel.pyx', 'cflabel.c']}
+PACKAGES = ["la", "la/tests", "la/util", "la/util/tests"]
+PACKAGE_DATA = {'la': ['LICENSE']}
REQUIRES = ["numpy"]
@@ -142,11 +142,11 @@
package_data=PACKAGE_DATA,
requires=REQUIRES,
zip_safe=False,
- ext_modules = [Extension("la.util.cflabel", ["la/src/cflabel.c"])]
+ ext_modules = [Extension("la.cflabel", ["la/src/cflabel.c"])]
)
except SystemExit:
# Probably clistmap.c failed to compile, so use slower python version
- msg = '\nLooks like clistmap.c failed to compile, so the slower python '
+ msg = '\nLooks like cflabel.c failed to compile, so the slower python '
msg += 'version will be used instead.\n'
print msg
setup(name=NAME,

0 comments on commit d397cce

Please sign in to comment.
Something went wrong with that request. Please try again.