renamed 'cmd' module to 'cmdutils' to avoid module name conflict with…

… native python 'cmd'. The conflict was preventing yum from working on EC2
columbia-applied-data-science · May 28, 2014 · d2412ce · d2412ce
1 parent 5183c34
commit d2412ce
Show file tree

Hide file tree

Showing 15 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ Examples
 Packages
 --------
 
-### `cmd` 
+### `cmdutils` 
 * Unix-like command line utilities.  Filters (read from stdin/write to stdout) for files.
 * Focus on stream processing and csv files.
 

diff --git a/makefile b/makefile
@@ -50,7 +50,7 @@ test-common:
 	$(PYTHON) -m $(UNITTEST) discover -s $(TESTDIR) -p '*common*' -v
 
 test-cmd:
-	$(PYTHON) -m $(UNITTEST) discover -s $(TESTDIR) -p '*cmd*' -v
+	$(PYTHON) -m $(UNITTEST) discover -s $(TESTDIR) -p '*cmdutils*' -v
 
 trailing-spaces:
 	find rosetta -name "*.py" | xargs perl -pi -e 's/[ \t]*$$//'

diff --git a/rosetta/cmd/__init__.py → rosetta/cmdutils/__init__.py b/rosetta/cmd/__init__.py → rosetta/cmdutils/__init__.py
diff --git a/rosetta/cmd/bashrc_additions → rosetta/cmdutils/bashrc_additions b/rosetta/cmd/bashrc_additions → rosetta/cmdutils/bashrc_additions
diff --git a/rosetta/cmd/concat_csv.py → rosetta/cmdutils/concat_csv.py b/rosetta/cmd/concat_csv.py → rosetta/cmdutils/concat_csv.py
diff --git a/rosetta/cmd/cut.py → rosetta/cmdutils/cut.py b/rosetta/cmd/cut.py → rosetta/cmdutils/cut.py
diff --git a/rosetta/cmd/files_to_vw.py → rosetta/cmdutils/files_to_vw.py b/rosetta/cmd/files_to_vw.py → rosetta/cmdutils/files_to_vw.py
diff --git a/rosetta/cmd/filter_sfile.py → rosetta/cmdutils/filter_sfile.py b/rosetta/cmd/filter_sfile.py → rosetta/cmdutils/filter_sfile.py
diff --git a/rosetta/cmd/groupby_reduce.py → rosetta/cmdutils/groupby_reduce.py b/rosetta/cmd/groupby_reduce.py → rosetta/cmdutils/groupby_reduce.py
diff --git a/rosetta/cmd/join_csv.py → rosetta/cmdutils/join_csv.py b/rosetta/cmd/join_csv.py → rosetta/cmdutils/join_csv.py
diff --git a/rosetta/cmd/row_filter.py → rosetta/cmdutils/row_filter.py b/rosetta/cmd/row_filter.py → rosetta/cmdutils/row_filter.py
diff --git a/rosetta/cmd/split.py → rosetta/cmdutils/split.py b/rosetta/cmd/split.py → rosetta/cmdutils/split.py
diff --git a/rosetta/cmd/subsample.py → rosetta/cmdutils/subsample.py b/rosetta/cmd/subsample.py → rosetta/cmdutils/subsample.py
diff --git a/rosetta/tests/test_cmd.py b/rosetta/tests/test_cmd.py
@@ -2,7 +2,7 @@
 from StringIO import StringIO
 from numpy.testing import assert_allclose
 
-from rosetta.cmd import concat_csv, join_csv, subsample, cut, row_filter, \
+from rosetta.cmdutils import concat_csv, join_csv, subsample, cut, row_filter, \
     groupby_reduce
 
 

diff --git a/setup.py b/setup.py
@@ -10,19 +10,19 @@
     "processing")
 
 SCRIPTS = [
-    'rosetta/cmd/' + name for name in 
+    'rosetta/cmdutils/' + name for name in 
     ['concat_csv.py', 'cut.py', 'join_csv.py',
     'row_filter.py', 'split.py', 'subsample.py',
     'files_to_vw.py', 'filter_sfile.py', 'groupby_reduce.py']]
 
 PACKAGES =  ['rosetta'] + [
     'rosetta.' + name for name in 
-    ['cmd', 'modeling', 'parallel', 'text', 'workflow']]
+    ['cmdutils', 'modeling', 'parallel', 'text', 'workflow']]
 
 
 #PY_MODULES =  ['rosetta'] + [
 #    'rosetta/' + name for name in 
-#    ['cmd', 'modeling', 'parallel', 'text', 'workflow']]
+#    ['cmdutils', 'modeling', 'parallel', 'text', 'workflow']]
 
 
 setup(