Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'release/1.3.2' into develop
  • Loading branch information
Kwpolska committed Jul 2, 2015
2 parents a0892ec + aadfb63 commit bbe09b2
Show file tree
Hide file tree
Showing 13 changed files with 66 additions and 29 deletions.
6 changes: 6 additions & 0 deletions .eggs/README.txt
@@ -0,0 +1,6 @@
This directory contains eggs that were downloaded by setuptools to build, test, and run plug-ins.

This directory caches those eggs to prevent repeated downloads.

However, it is safe to delete this directory.

7 changes: 4 additions & 3 deletions .pypt/LICENSE.PyPT
Expand Up @@ -4,10 +4,11 @@ commercial (a.k.a. proprietary) license, you must contact me first.

HOWEVER, the following files must remain under the BSD license:

* /.pypt/aursend
* /.pypt/commitlog
* /.pypt/ghrel
* /.pypt/localegen
* /.pypt/README.PyPT
* /.pypt/PYPT-UPDATE
* /.pypt/README.rst
* /.pypt/LICENSE.PyPT
* /docs/CONTRIBUTING.rst
* /CONTRIBUTING.rst
Expand All @@ -17,7 +18,7 @@ HOWEVER, the following files must remain under the BSD license:
The README file for PyPT MAY NOT be relicensed.

The actual license is: (the name may have been replaced by yours if you did the
Getting up to speed in 15 easy steps, it was mine originally, and the
Getting up to speed in 16 easy steps, it was mine originally, and the
version in .pypt/ should reflect that.)

LICENSE
Expand Down
21 changes: 13 additions & 8 deletions .pypt/README.rst
Expand Up @@ -5,8 +5,8 @@ Python Project Template. INSERT TAGLINE HERE.™
:Author: Chris Warrick <chris@chriswarrick.com>
:Copyright: © 2013-2015, Chris Warrick.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
:Date: 2015-06-29
:Version: 1.1.1
:Date: 2015-06-30
:Version: 1.2.1

.. index: README
.. image:: https://travis-ci.org/Kwpolska/python-project-template.png?branch=master
Expand Down Expand Up @@ -48,7 +48,8 @@ The template contains the following files to get you started:
script
* ``__init__.py`` and ``template.py`` files in the Python package directory
* A good-enough ``setup.py`` file
* ``tests.py`` containing some *Is My Python Sane?*-style tests
* ``tests/`` containing some *Is My Python Sane?*-style tests (using ``py.test``)
* An automated global update script (``.pypt/PYPT-UPDATE``)
* Entry points configuration ready to be uncommented
* Addons for Qt users
* PKGBUILDs for the Arch Linux User Repository (AUR)
Expand All @@ -63,7 +64,7 @@ The template contains the following files to get you started:
* committing into git, finishing the ``git flow`` release
* creating a GitHub Releases entry

Getting up to speed in 15 easy steps
Getting up to speed in 16 easy steps
====================================

1. Create the repository for the project on GitHub and enable it on Travis CI.
Expand Down Expand Up @@ -99,8 +100,8 @@ Getting up to speed in 15 easy steps
1. ``/docs/README.rst`` to ``/README.rst`` and ``/README``
2. ``/docs/CHANGELOG.rst`` to ``/CHANGELOG.rst``

7. Modify ``/.pypt/config``
8. Generate a `GitHub Personal Access Token <https://github.com/settings/tokens>`_ and write it to a ``/.pypt/gh-token`` file
7. Modify ``/.pypt/config``.
8. Generate a `GitHub Personal Access Token <https://github.com/settings/tokens>`_ and write it to a ``/.pypt/gh-token`` file.
9. Customize ``/setup.py`` to your liking. You should pay attention to the
classifiers and the commented parts.
10. Customize ``requirements.txt``.
Expand All @@ -123,8 +124,11 @@ Getting up to speed in 15 easy steps
PS. GNU GPL is not a good idea. You can use it, but the world would be
much happier if you did not.

15. Remove ``/.git``, and run the following commands::
15. If you have a ``PYPT-UPDATE`` script, add your new project to the list
there. If not, you may want to copy it from ``.pypt`` and set it up.
16. Run the following commands::

rm -rf .git .pypt/PYPT-UPDATE
source .pypt/config
git init
git remote add origin git@github.com:$GITUSER/$GITREPO
Expand All @@ -148,7 +152,8 @@ commercial (a.k.a. proprietary) license, you must contact me first.
* /.pypt/commitlog
* /.pypt/ghrel
* /.pypt/localegen
* /.pypt/README.PyPT
* /.pypt/PYPT-UPDATE
* /.pypt/README.rst
* /.pypt/LICENSE.PyPT
* /docs/CONTRIBUTING.rst
* /CONTRIBUTING.rst
Expand Down
7 changes: 5 additions & 2 deletions CHANGELOG.rst
Expand Up @@ -2,7 +2,10 @@
Appendix A. Changelog
=====================

:Version: 1.3.1
:Version: 1.3.2

1.3.2
* Added two options that should not be used, EVER. Please ignore them.

1.3.1
* Use rq from PyPI instead of GitHub
Expand All @@ -22,7 +25,7 @@ Appendix A. Changelog

1.1.0
* Changed hashing mechanism to sha256 + bcrypt.
Hashes will be fixed automatically on first login of each user.
Hashes will be fixed automatically on first login of each user.
* Added ``passlib`` dependency.
* rqworker queue is now named ``coil`` (was ``default``)
* add trailing slashes to all URLs
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.rst
Expand Up @@ -5,8 +5,8 @@ Appendix A. Contribution rules
:Author: Chris Warrick <chris@chriswarrick.com>
:Copyright: © 2015, Chris Warrick.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
:Date: 2015-06-18
:Version: 1.3.1
:Date: 2015-07-02
:Version: 1.3.2

.. index:: contributing

Expand Down
11 changes: 11 additions & 0 deletions README
@@ -0,0 +1,11 @@
========
Coil CMS
========

Making Nikola accessible for non-programmers, casual users, and all other
people that don’t feel comfortable using the command line.

Setup
-----

Setting up Coil CMS is described in `the documentation <https://coil.readthedocs.org/en/latest/admin/setup/>`_.
2 changes: 1 addition & 1 deletion coil/__init__.py
Expand Up @@ -29,4 +29,4 @@

__all__ = ['__version__']

__version__ = '1.3.1'
__version__ = '1.3.2'
12 changes: 9 additions & 3 deletions coil/__main__.py
Expand Up @@ -29,7 +29,7 @@
u"""Coil CMS v{0}
Usage:
coil devserver [-b | --browser] [-p <port> | --port=<port>]
coil devserver [-b | --browser] [-p <port> | --port=<port>] [--no-url-fix] [--no-debug]
coil write_users
coil -h | --help
coil --version
Expand All @@ -39,6 +39,8 @@
--version Show version.
-b, --browser Open Coil CMS in the browser after starting.
-p <port>, --port=<port> Port to use [default: 8001].
--no-url-fix Don't fix the URL in devserver. DO NOT USE.
--no-debug Don't run devserver in debug mode.
"""

from __future__ import unicode_literals
Expand Down Expand Up @@ -81,8 +83,12 @@ def devserver(arguments):
if coil.web.app:
port = int(arguments['--port'])
url = 'http://localhost:{0}/'.format(port)
coil.web.configure_url(url)
coil.web.app.config['DEBUG'] = True
nourl = arguments['--no-url-fix']
nodebug = arguments['--no-debug']
if not nourl:
coil.web.configure_url(url)
if not nodebug:
coil.web.app.config['DEBUG'] = True

if arguments['--browser']:
webbrowser.open(url)
Expand Down
5 changes: 4 additions & 1 deletion docs/CHANGELOG.rst
Expand Up @@ -2,7 +2,10 @@
Appendix A. Changelog
=====================

:Version: 1.3.1
:Version: 1.3.2

1.3.2
* Added two options that should not be used, EVER. Please ignore them.

1.3.1
* Use rq from PyPI instead of GitHub
Expand Down
4 changes: 2 additions & 2 deletions docs/CONTRIBUTING.rst
Expand Up @@ -5,8 +5,8 @@ Appendix A. Contribution rules
:Author: Chris Warrick <chris@chriswarrick.com>
:Copyright: © 2015, Chris Warrick.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
:Date: 2015-06-18
:Version: 1.3.1
:Date: 2015-07-02
:Version: 1.3.2

.. index:: contributing

Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Expand Up @@ -55,9 +55,9 @@
# built documents.
#
# The short X.Y version.
version = '1.3.1'
version = '1.3.2'
# The full version, including alpha/beta/rc tags.
release = '1.3.1'
release = '1.3.2'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
10 changes: 6 additions & 4 deletions release
Expand Up @@ -169,10 +169,12 @@ if [[ $? = 1 ]]; then
fi

status 'Running tests...'
./setup.py test
if [[ $? = 1 ]]; then
error "Tests failed. Fix your code or don't come back."
exit 1
if [[ -e tests ]]; then
./setup.py test
if [[ $? = 1 ]]; then
error "Tests failed. Fix your code or don't come back."
exit 1
fi
fi

status 'Running pre-sdist.hook...'
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -7,7 +7,7 @@
dependencies = [l.strip() for l in fh]

setup(name='coil',
version='1.3.1',
version='1.3.2',
description='A user-friendly CMS frontend for Nikola.',
keywords='coil,nikola,cms',
author='Chris Warrick, Roberto Alsina, Henry Hirsch et al.',
Expand Down

0 comments on commit bbe09b2

Please sign in to comment.