Skip to content

Commit 6fb53fd

Browse files
KwpolskaKwpolska
committed
v1.3.10: coil unlock and link fixes
Signed-off-by: Chris Warrick <[email protected]>
1 parent ac42d86 commit 6fb53fd

24 files changed

+58
-37
lines changed

‎.pypt/commitlog

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# -*- encoding: utf-8 -*-
33
# Kw’s Release Tools/Python Project Template
44
# Commit and Changelog Parser
5-
# Copyright © 2013-2016, Chris Warrick.
5+
# Copyright © 2013-2017, Chris Warrick.
66
# All rights reserved.
77
#
88
# Redistribution and use in source and binary forms, with or without
@@ -88,7 +88,7 @@ def main():
8888
new_version = args.new_version[0]
8989

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

9494
for i in e:
@@ -97,7 +97,6 @@ def main():
9797
print('ERROR: mismatched tags')
9898
return 1
9999
else:
100-
i[0] = 'C' + i[0] # regexp hack
101100
if i[0] == 'COMMIT':
102101
with open(filename + '-commit', 'w') as fh:
103102
fh.write(i[1])

‎.pypt/ghrel

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# -*- encoding: utf-8 -*-
33
# Kw’s Release Tools/Python Project Template
44
# GitHub Release Creator
5-
# Copyright © 2013-2016, Chris Warrick.
5+
# Copyright © 2013-2017, Chris Warrick.
66
# All rights reserved.
77
#
88
# Redistribution and use in source and binary forms, with or without

‎.venv

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nikola-py3
1+
nikola

‎CHANGELOG.rst

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
Appendix A. Changelog
33
=====================
44

5-
:Version: 1.3.9
5+
:Version: 1.3.10
6+
7+
1.3.10
8+
* Add `coil unlock` command
9+
* Fix links to docs
610

711
1.3.9
812
* Work on non-English sites (fix #45)

‎CONTRIBUTING.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Appendix A. Contribution rules
33
==============================
44
:Info: Those are the contribution rules for Coil CMS.
5-
:Copyright: © 2012-2016, Chris Warrick.
5+
:Copyright: © 2012-2017, Chris Warrick.
66
:License: 3-clause BSD
77

88
.. index:: contributing

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright © 2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
1+
Copyright © 2014-2017 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
22

33
Permission is hereby granted, free of charge, to any
44
person obtaining a copy of this software and associated

‎README

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ people that don’t feel comfortable using the command line.
88
Setup
99
-----
1010

11-
Setting up Coil CMS is described in `the documentation <https://coil.readthedocs.org/en/latest/admin/setup/>`_.
11+
Setting up Coil CMS is described in `the documentation <https://coil.readthedocs.io/admin/setup/>`_.

‎README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ people that don’t feel comfortable using the command line.
88
Setup
99
-----
1010

11-
Setting up Coil CMS is described in `the documentation <https://coil.readthedocs.org/en/latest/admin/setup/>`_.
11+
Setting up Coil CMS is described in `the documentation <https://coil.readthedocs.io/admin/setup/>`_.

‎coil/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
22

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

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

3030
__all__ = ['__version__']
3131

32-
__version__ = '1.3.9'
32+
__version__ = '1.3.10'

‎coil/__main__.py

+14-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
22

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

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

6467

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

100+
101+
def unlock(arguments):
102+
"""Unlock the database."""
103+
import redis
104+
u = coil.utils.ask("Redis URL", "redis://localhost:6379/0")
105+
db = redis.StrictRedis.from_url(u)
106+
db.set('site:lock', 0)
107+
print("Database unlocked.")
108+
return 0
109+
97110
if __name__ == '__main__':
98111
main()

‎coil/data/coil_assets/css/coil.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright © 2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
2+
* Copyright © 2014-2017 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
33
* See /LICENSE for licensing information.
44
*/
55

‎coil/data/coil_assets/js/coil.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright © 2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
2+
* Copyright © 2014-2017 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
33
* See /LICENSE for licensing information.
44
*/
55

‎coil/forms.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
22

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

66
# Permission is hereby granted, free of charge, to any
77
# person obtaining a copy of this software and associated

‎coil/init.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
22

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

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

4141

‎coil/tasks.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
22

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

66
# Permission is hereby granted, free of charge, to any
77
# person obtaining a copy of this software and associated

‎coil/utils.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
22

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

66
# Permission is hereby granted, free of charge, to any
77
# person obtaining a copy of this software and associated

‎coil/web.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
22

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

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

‎docs/CHANGELOG.rst

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
Appendix A. Changelog
33
=====================
44

5-
:Version: 1.3.9
5+
:Version: 1.3.10
6+
7+
1.3.10
8+
* Add `coil unlock` command
9+
* Fix links to docs
610

711
1.3.9
812
* Work on non-English sites (fix #45)

‎docs/CONTRIBUTING.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Appendix A. Contribution rules
33
==============================
44
:Info: Those are the contribution rules for Coil CMS.
5-
:Copyright: © 2012-2016, Chris Warrick.
5+
:Copyright: © 2012-2017, Chris Warrick.
66
:License: 3-clause BSD
77

88
.. index:: contributing

‎docs/LICENSE.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Appendix B. License
33
===================
44

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

77
Permission is hereby granted, free of charge, to any
88
person obtaining a copy of this software and associated

‎docs/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ people that don’t feel comfortable using the command line.
88
Setup
99
-----
1010

11-
Setting up Coil CMS is described in `the documentation <https://coil.readthedocs.org/en/latest/admin/setup/>`_.
11+
Setting up Coil CMS is described in `the documentation <https://coil.readthedocs.io/admin/setup/>`_.

‎docs/conf.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@
4848

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

5353
# The version info for the project you're documenting, acts as replacement for
5454
# |version| and |release|, also used in various other places throughout the
5555
# built documents.
5656
#
5757
# The short X.Y version.
58-
version = '1.3.9'
58+
version = '1.3.10'
5959
# The full version, including alpha/beta/rc tags.
60-
release = '1.3.9'
60+
release = '1.3.10'
6161

6262
# The language for content autogenerated by Sphinx. Refer to documentation
6363
# for a list of supported languages.

‎release

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/zsh
22
# The Release Script
33
# Part of the Python Project Template.
4-
# Copyright © 2013-2016, Chris Warrick.
4+
# Copyright © 2013-2017, Chris Warrick.
55
# All rights reserved.
66
#
77
# 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
138138
sed "s/__version__ = .*/__version__ = '$version'/g" $PROJECTLC/__init__.py -i
139139
sed "s/:Date: .*/:Date: $date/g" docs/*.rst -i
140140

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

144144
cp docs/README.rst docs/CHANGELOG.rst docs/CONTRIBUTING.rst .
145145
cp docs/README.rst README

‎setup.py

+6-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
dependencies = [l.strip() for l in fh]
88

99
setup(name='coil',
10-
version='1.3.9',
10+
version='1.3.10',
1111
description='A user-friendly CMS frontend for Nikola.',
1212
keywords='coil,nikola,cms',
1313
author='Chris Warrick, Roberto Alsina, Henry Hirsch et al.',
@@ -18,13 +18,14 @@
1818
platforms='any',
1919
zip_safe=False,
2020
# http://pypi.python.org/pypi?%3Aaction=list_classifiers
21-
classifiers=['Development Status :: 5 - Production/Stable',
21+
classifiers=['Development Status :: 7 - Inactive',
2222
'Programming Language :: Python',
23-
'Programming Language :: Python :: 2',
24-
'Programming Language :: Python :: 2.7',
2523
'Programming Language :: Python :: 3',
2624
'Programming Language :: Python :: 3.3',
27-
'Programming Language :: Python :: 3.4'],
25+
'Programming Language :: Python :: 3.4',
26+
'Programming Language :: Python :: 3.5',
27+
'Programming Language :: Python :: 3.6',
28+
],
2829
packages=['coil'],
2930
install_requires=dependencies,
3031
include_package_data=True,

0 commit comments

Comments
 (0)