Merge lp:~frankban/juju-quickstart/prepare-for-pypi into lp:juju-quickstart

[Francesco Banconi]

Update for PyPI release.

https://codereview.appspot.com/51790045/

[Francesco Banconi (frankban)]

Reviewers: mp+203770_code.launchpad.net,

Message:
Please take a look.

Description:
Update for PyPI release.

https://code.launchpad.net/~frankban/juju-quickstart/prepare-for-pypi/+merge/203770

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/51790045/

Affected files (+35, -8 lines):
   M Makefile
   M README.rst
   A [revision details]
   M setup.py

Index: Makefile
=== modified file 'Makefile'
--- Makefile 2013-11-14 12:20:44 +0000
+++ Makefile 2014-01-29 15:25:06 +0000
@@ -55,6 +55,7 @@
   @echo ' Juju environment by setting the JUJU_ENV environment variable,'
   @echo ' e.g.: "make run JUJU_ENV=ec2".'
   @echo 'make clean - Get rid of bytecode files, build and dist dirs, venv.'
+ @echo 'make release - Register and upload a release on PyPI.'

  install:
   $(PYTHON) setup.py install
@@ -63,6 +64,9 @@
  lint: setup
   @$(VENV)/bin/flake8 --show-source --exclude=$(VENV) ./quickstart

+release: check
+ $(PYTHON) setup.py register sdist upload
+
  run: setup
   $(VENV)/bin/python ./juju-quickstart --debug

@@ -77,4 +81,4 @@
       --with-coverage --cover-package=quickstart quickstart
   @rm .coverage

-.PHONY: all clean check help install lint run setup source sysdeps test
+.PHONY: all clean check help install lint release run setup source sysdeps
test

Index: README.rst
=== modified file 'README.rst'
--- README.rst 2013-11-06 15:21:19 +0000
+++ README.rst 2014-01-29 15:25:06 +0000
@@ -1,9 +1,30 @@
  Juju Quickstart
  ===============

-Juju Quickstart is a Juju plugin which allows for easily setting up a Juju
-environment in very few steps. The environment is bootstrapped and set up
so
-that it can be managed using a Web interface (the Juju GUI).
-
-Bundle deployments are also supported, and allow for setting up a complete
-topology of services in one simple command.
+Juju Quickstart is an opinionated command-line tool that quickly starts
Juju
+and the GUI, whether you've never installed Juju or you have an existing
Juju
+environment running.
+
+Features include the following:
+
+* New users are guided, as needed, to install Juju, set up SSH keys, and
+ configure it for first use.
+* Juju environments can be created and managed from a command line
interactive
+ session.
+* The Juju GUI is automatically installed, adding no additional machines
+ (installing on an existing state server when possible).
+* Bundles can be deployed, from local files, HTTP(S) URLs or the charm
store,
+ so that a complete topology of services can be set up in one simple
command.
+* Quickstart ends by opening the browser and automatically logging the user
+ into the GUI, to observe and manage the environment visually.
+* Users with a running Juju environment can run the quickstart command
again to
+ simply re-open the GUI without having to find the proper URL and
password.
+
+To install and start Juju Quickstart, run the following::
+
+ juju-quickstart [-i]
+
+Run ``juju-quickstart -h`` for a list of all the available options.
+
+Once Juju has been installed, the command can also be run as a juju plugin,
+without the hyphen (``juju quickstart``).

Index: [revision details]
=== ad...

[Gary Poster (gary)]

LGTM. Thank you. :-)

https://codereview.appspot.com/51790045/

[Francesco Banconi (frankban)]

*** Submitted:

Update for PyPI release.

R=gary.poster
CC=
https://codereview.appspot.com/51790045

https://codereview.appspot.com/51790045/

=== modified file 'Makefile'
--- Makefile	2013-11-14 12:20:44 +0000
+++ Makefile	2014-01-29 15:26:13 +0000
@@ -55,6 +55,7 @@
 	@echo '  Juju environment by setting the JUJU_ENV environment variable,'
 	@echo '  e.g.: "make run JUJU_ENV=ec2".'
 	@echo 'make clean - Get rid of bytecode files, build and dist dirs, venv.'
+	@echo 'make release - Register and upload a release on PyPI.'
 
 install:
 	$(PYTHON) setup.py install
@@ -63,6 +64,9 @@
 lint: setup
 	@$(VENV)/bin/flake8 --show-source --exclude=$(VENV) ./quickstart
 
+release: check
+	$(PYTHON) setup.py register sdist upload
+
 run: setup
 	$(VENV)/bin/python ./juju-quickstart --debug
 
@@ -77,4 +81,4 @@
 	    --with-coverage --cover-package=quickstart quickstart
 	@rm .coverage
 
-.PHONY: all clean check help install lint run setup source sysdeps test
+.PHONY: all clean check help install lint release run setup source sysdeps test

=== modified file 'README.rst'
--- README.rst	2013-11-06 15:21:19 +0000
+++ README.rst	2014-01-29 15:26:13 +0000
@@ -1,9 +1,30 @@
 Juju Quickstart
 ===============
 
-Juju Quickstart is a Juju plugin which allows for easily setting up a Juju
-environment in very few steps. The environment is bootstrapped and set up so
-that it can be managed using a Web interface (the Juju GUI).
-
-Bundle deployments are also supported, and allow for setting up a complete
-topology of services in one simple command.
+Juju Quickstart is an opinionated command-line tool that quickly starts Juju
+and the GUI, whether you've never installed Juju or you have an existing Juju
+environment running.
+
+Features include the following:
+
+* New users are guided, as needed, to install Juju, set up SSH keys, and
+  configure it for first use.
+* Juju environments can be created and managed from a command line interactive
+  session.
+* The Juju GUI is automatically installed, adding no additional machines
+  (installing on an existing state server when possible).
+* Bundles can be deployed, from local files, HTTP(S) URLs or the charm store,
+  so that a complete topology of services can be set up in one simple command.
+* Quickstart ends by opening the browser and automatically logging the user
+  into the GUI, to observe and manage the environment visually.
+* Users with a running Juju environment can run the quickstart command again to
+  simply re-open the GUI without having to find the proper URL and password.
+
+To install and start Juju Quickstart, run the following::
+
+    juju-quickstart [-i]
+
+Run ``juju-quickstart -h`` for a list of all the available options.
+
+Once Juju has been installed, the command can also be run as a juju plugin,
+without the hyphen (``juju quickstart``).

=== modified file 'setup.py'
--- setup.py	2013-11-14 10:37:29 +0000
+++ setup.py	2014-01-29 15:26:13 +0000
@@ -64,7 +64,7 @@
     install_requires=install_requires,
     zip_safe=False,
     classifiers=[
-        'Development Status :: 3 - Alpha',
+        'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'Intended Audience :: System Administrators',
         'License :: OSI Approved :: GNU Affero General Public License v3',