Merge pull request #103 from martinholmer/cli-to-pb

Move code from pb/cli to pb directory
PSLmodels · Nov 9, 2018 · 0fb2e9e · 0fb2e9e
2 parents 36d36d0 + f9ca4bc
commit 0fb2e9e
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 3 deletions.
diff --git a/pb/__init__.py b/pb/__init__.py
@@ -0,0 +1,8 @@
+"""
+Specify what is available to import from the pb package.
+"""
+from pb.main import start
+
+from pb._version import get_versions
+__version__ = get_versions()['version']
+del get_versions
diff --git a/pb/cli/config.py → pb/config.py b/pb/cli/config.py → pb/config.py
diff --git a/pb/cli/main.py → pb/main.py b/pb/cli/main.py → pb/main.py
@@ -45,7 +45,7 @@ def default_token_config():
 
 
 @click.group(context_settings=CONTEXT_SETTINGS)
-@click.version_option(prog_name="pb", version="0.8.0")
+@click.version_option(prog_name="pb", version="0.9.0")
 @click.pass_context
 @u.required_commands("anaconda", "conda", "git", "tar", "tsort")
 def cli(ctx):

diff --git a/pb/cli/package.py → pb/package.py b/pb/cli/package.py → pb/package.py
diff --git a/pb/cli/repository.py → pb/repository.py b/pb/cli/repository.py → pb/repository.py
diff --git a/pb/cli/utils.py → pb/utils.py b/pb/cli/utils.py → pb/utils.py
diff --git a/release-packages.sh b/release-packages.sh
@@ -38,6 +38,8 @@ fi
 # begin script execution
 echo "STARTING : `date`"
 
+echo "[$NAME] using `pb --version`"
+
 echo "[$NAME] clearing-deck"
 
 # uninstall local taxcalc package

diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
     readme = f.read()
 
 setup(name="Package-Builder",
-      version="0.8.0",
+      version="0.9.0",
       description="Policy Simulation Library (PSL) models package management",
       url="https://github.com/open-source-economics/Package-Builder",
       author="Martin Holmer (based on original work by Joseph Crail)",
@@ -27,5 +27,5 @@
       long_description=readme,
       entry_points="""
         [console_scripts]
-        pb=pb.cli.main:start
+        pb=pb.main:start
       """)