diff --git a/README.md b/README.md index b2c9ae0..d3b8d6f 100644 --- a/README.md +++ b/README.md @@ -45,8 +45,8 @@ crawl-fs -i -o -b .vertices.csv and .edges.csv file which can be ingested into a RedBlackGraph pip install RedBlackGraph -# use rgbcf to generate both a simple form and cannonical form of a Red Black Graph (xlsx files) -rgbcf -f -o +# use rbgcf to generate both a simple form and cannonical form of a Red Black Graph (xlsx files) +rbgcf -f -o # Use excel to view output diff --git a/bin/setup-osx-build-env.sh b/bin/setup-osx-build-env.sh new file mode 100755 index 0000000..4bb669c --- /dev/null +++ b/bin/setup-osx-build-env.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +eval "$(conda shell.bash hook)" + +conda create -y --name rgb-build-36 python=3.6 +conda create -y --name rgb-build-37 python=3.7 +conda create -y --name rgb-build-38 python=3.8 + +docker pull quay.io/pypa/manylinux2010_x86_64 + diff --git a/redblackgraph/setup.py b/redblackgraph/setup.py index a50ea39..088dc17 100644 --- a/redblackgraph/setup.py +++ b/redblackgraph/setup.py @@ -6,6 +6,9 @@ def configuration(parent_package='',top_path=None): config = Configuration('redblackgraph',parent_package,top_path) config.add_subpackage('core') config.add_subpackage('sparse') + config.add_subpackage('reference') + config.add_subpackage('types') + config.add_subpackage('util') config.make_config_py() return config diff --git a/scripts/rgbcf b/scripts/rbgcf similarity index 96% rename from scripts/rgbcf rename to scripts/rbgcf index 8726782..4e16fa0 100755 --- a/scripts/rgbcf +++ b/scripts/rbgcf @@ -12,9 +12,9 @@ MAX_PRACTICAL_SIZE = 1500 if __name__ == '__main__': parser = argparse.ArgumentParser( - description="rgbcf - get cannonical form: parses rbg ingest files and generates the cannonical form", + description="rbgcf - get cannonical form: parses rbg ingest files and generates the cannonical form", add_help=False, - usage="rgbcf -f -o (.vertices.csv and .edges.csv must exist)", + usage="rbgcf -f -o (.vertices.csv and .edges.csv must exist)", ) parser.add_argument("-f", "--basefile", metavar="", type=str, help="base file name", required=True) parser.add_argument("-o", "--outdir", metavar="", type=str, diff --git a/setup.py b/setup.py index 8b67db1..18d4a31 100644 --- a/setup.py +++ b/setup.py @@ -89,7 +89,7 @@ def configuration(parent_package='', top_path=None): 'cython' ], scripts=[ - 'scripts/rgbcf', + 'scripts/rbgcf', ] )