Skip to content
Permalink
Browse files
v1.3.10: coil unlock and link fixes
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
  • Loading branch information
Kwpolska committed Feb 14, 2017
1 parent 839993d commit 5af92afcb039104ab7a42a8b0e60795f989a66cc
@@ -2,7 +2,7 @@
# -*- encoding: utf-8 -*-
# Kw’s Release Tools/Python Project Template
# Commit and Changelog Parser
# Copyright © 2013-2016, Chris Warrick.
# Copyright © 2013-2017, Chris Warrick.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -88,7 +88,7 @@ def main():
new_version = args.new_version[0]

with open(filename) as fh:
e = re.findall('#~ C(.*?) MESSAGE START ~#\n(.*?)\n#~ C(.*?) MESSAGE '
e = re.findall('#~ (C[A-Z]+) MESSAGE START ~#\n(.*?)\n#~ (C[A-Z]+) MESSAGE '
'END ~#', fh.read(), flags=re.S)

for i in e:
@@ -97,7 +97,6 @@ def main():
print('ERROR: mismatched tags')
return 1
else:
i[0] = 'C' + i[0] # regexp hack
if i[0] == 'COMMIT':
with open(filename + '-commit', 'w') as fh:
fh.write(i[1])
@@ -2,7 +2,7 @@
# -*- encoding: utf-8 -*-
# Kw’s Release Tools/Python Project Template
# GitHub Release Creator
# Copyright © 2013-2016, Chris Warrick.
# Copyright © 2013-2017, Chris Warrick.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
2 .venv
@@ -1 +1 @@
nikola-py3
nikola
@@ -2,7 +2,11 @@
Appendix A. Changelog
=====================

:Version: 1.3.9
:Version: 1.3.10

1.3.10
* Add `coil unlock` command
* Fix links to docs

1.3.9
* Work on non-English sites (fix #45)
@@ -2,7 +2,7 @@
Appendix A. Contribution rules
==============================
:Info: Those are the contribution rules for Coil CMS.
:Copyright: © 2012-2016, Chris Warrick.
:Copyright: © 2012-2017, Chris Warrick.
:License: 3-clause BSD

.. index:: contributing
@@ -1,4 +1,4 @@
Copyright © 2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
Copyright © 2014-2017 Chris Warrick, Roberto Alsina, Henry Hirsch et al.

Permission is hereby granted, free of charge, to any
person obtaining a copy of this software and associated
2 README
@@ -8,4 +8,4 @@ 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/>`_.
Setting up Coil CMS is described in `the documentation <https://coil.readthedocs.io/admin/setup/>`_.
@@ -8,4 +8,4 @@ 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/>`_.
Setting up Coil CMS is described in `the documentation <https://coil.readthedocs.io/admin/setup/>`_.
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Coil CMS v1.2.0
# Copyright © 2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
# Copyright © 2014-2017 Chris Warrick, Roberto Alsina, Henry Hirsch et al.

# Permission is hereby granted, free of charge, to any
# person obtaining a copy of this software and associated
@@ -29,4 +29,4 @@

__all__ = ['__version__']

__version__ = '1.3.9'
__version__ = '1.3.10'
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Coil CMS v1.2.0
# Copyright © 2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
# Copyright © 2014-2017 Chris Warrick, Roberto Alsina, Henry Hirsch et al.

# Permission is hereby granted, free of charge, to any
# person obtaining a copy of this software and associated
@@ -30,6 +30,7 @@
Usage:
coil devserver [-b | --browser] [-p <port> | --port=<port>] [--no-url-fix] [--no-debug]
coil unlock
coil write_users
coil -h | --help
coil --version
@@ -60,6 +61,8 @@ def main():
sys.exit(write_users(arguments))
elif arguments['devserver']:
sys.exit(devserver(arguments))
elif arguments['unlock']:
sys.exit(unlock(arguments))


def init(arguments):
@@ -94,5 +97,15 @@ def devserver(arguments):
print("FATAL: no conf.py found")
return 255


def unlock(arguments):
"""Unlock the database."""
import redis
u = coil.utils.ask("Redis URL", "redis://localhost:6379/0")
db = redis.StrictRedis.from_url(u)
db.set('site:lock', 0)
print("Database unlocked.")
return 0

if __name__ == '__main__':
main()
@@ -1,5 +1,5 @@
/*
* Copyright © 2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
* Copyright © 2014-2017 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
* See /LICENSE for licensing information.
*/

@@ -1,5 +1,5 @@
/*
* Copyright © 2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
* Copyright © 2014-2017 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
* See /LICENSE for licensing information.
*/

@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Coil CMS v1.2.0
# Copyright © 2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
# Copyright © 2014-2017 Chris Warrick, Roberto Alsina, Henry Hirsch et al.

# Permission is hereby granted, free of charge, to any
# person obtaining a copy of this software and associated
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Coil CMS v1.2.0
# Copyright © 2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
# Copyright © 2014-2017 Chris Warrick, Roberto Alsina, Henry Hirsch et al.

# Permission is hereby granted, free of charge, to any
# person obtaining a copy of this software and associated
@@ -35,7 +35,7 @@
def init():
"""Initialize a site."""
print("Please read the documentation and set up Coil CMS manually:")
print("https://coil.readthedocs.org/en/latest/admin/setup/")
print("https://coil.readthedocs.io/admin/setup/")
return 255


@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Coil CMS v1.2.0
# Copyright © 2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
# Copyright © 2014-2017 Chris Warrick, Roberto Alsina, Henry Hirsch et al.

# Permission is hereby granted, free of charge, to any
# person obtaining a copy of this software and associated
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Coil CMS v1.2.0
# Copyright © 2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
# Copyright © 2014-2017 Chris Warrick, Roberto Alsina, Henry Hirsch et al.

# Permission is hereby granted, free of charge, to any
# person obtaining a copy of this software and associated
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# Coil CMS v1.2.0
# Copyright © 2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
# Copyright © 2014-2017 Chris Warrick, Roberto Alsina, Henry Hirsch et al.

# Permission is hereby granted, free of charge, to any
# person obtaining a copy of this software and associated
@@ -143,7 +143,7 @@ def configure_site():
_site.default_lang: (
(app.config['NIKOLA_URL'],
'<i class="fa fa-globe"></i> View Site'),
('https://coil.readthedocs.org/en/latest/user/',
('http://coil.readthedocs.io/user/',
'<i class="fa fa-question-circle"></i> Help'),
)
}
@@ -2,7 +2,11 @@
Appendix A. Changelog
=====================

:Version: 1.3.9
:Version: 1.3.10

1.3.10
* Add `coil unlock` command
* Fix links to docs

1.3.9
* Work on non-English sites (fix #45)
@@ -2,7 +2,7 @@
Appendix A. Contribution rules
==============================
:Info: Those are the contribution rules for Coil CMS.
:Copyright: © 2012-2016, Chris Warrick.
:Copyright: © 2012-2017, Chris Warrick.
:License: 3-clause BSD

.. index:: contributing
@@ -2,7 +2,7 @@
Appendix B. License
===================

Copyright © 2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
Copyright © 2014-2017 Chris Warrick, Roberto Alsina, Henry Hirsch et al.

Permission is hereby granted, free of charge, to any
person obtaining a copy of this software and associated
@@ -8,4 +8,4 @@ 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/>`_.
Setting up Coil CMS is described in `the documentation <https://coil.readthedocs.io/admin/setup/>`_.
@@ -48,16 +48,16 @@

# General information about the project.
project = 'Coil CMS'
copyright = '2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al'
copyright = '2014-2017 Chris Warrick, Roberto Alsina, Henry Hirsch et al'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = '1.3.9'
version = '1.3.10'
# The full version, including alpha/beta/rc tags.
release = '1.3.9'
release = '1.3.10'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
@@ -1,7 +1,7 @@
#!/bin/zsh
# The Release Script
# Part of the Python Project Template.
# Copyright © 2013-2016, Chris Warrick.
# Copyright © 2013-2017, Chris Warrick.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -138,8 +138,8 @@ sed "s/# $PROJECT v.*/# $PROJECT v$version/" $PROJECTLC/**/*.py -i
sed "s/__version__ = .*/__version__ = '$version'/g" $PROJECTLC/__init__.py -i
sed "s/:Date: .*/:Date: $date/g" docs/*.rst -i

sed "s/pkgver=.*/pkgver=$version/g" PKGBUILD -i || true
sed "s/pkgver=.*/pkgver=$version/g" PKGBUILD-git -i || true
[[ -e "PKGBUILD" ]] && sed "s/pkgver=.*/pkgver=$version/g" PKGBUILD -i || true
[[ -e "PKGBUILD-git" ]] && sed "s/pkgver=.*/pkgver=$version/g" PKGBUILD-git -i || true

cp docs/README.rst docs/CHANGELOG.rst docs/CONTRIBUTING.rst .
cp docs/README.rst README
@@ -7,7 +7,7 @@
dependencies = [l.strip() for l in fh]

setup(name='coil',
version='1.3.9',
version='1.3.10',
description='A user-friendly CMS frontend for Nikola.',
keywords='coil,nikola,cms',
author='Chris Warrick, Roberto Alsina, Henry Hirsch et al.',
@@ -18,13 +18,14 @@
platforms='any',
zip_safe=False,
# http://pypi.python.org/pypi?%3Aaction=list_classifiers
classifiers=['Development Status :: 5 - Production/Stable',
classifiers=['Development Status :: 7 - Inactive',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4'],
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
],
packages=['coil'],
install_requires=dependencies,
include_package_data=True,

0 comments on commit 5af92af

Please sign in to comment.