Skip to content

Commit

Permalink
more 2015 🎆
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Warrick <[email protected]>
  • Loading branch information
Kwpolska committed Dec 27, 2014
1 parent 59e3bd2 commit 6846e85
Show file tree
Hide file tree
Showing 42 changed files with 226 additions and 678 deletions.
15 changes: 10 additions & 5 deletions .pypt/LICENSE.PyPT
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,15 @@ 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/localegen
* /release
* /.pypt/aursend
* /.pypt/commitlog
* /.pypt/localegen
* /.pypt/README.PyPT
* /.pypt/LICENSE.PyPT
* /docs/CONTRIBUTING.rst
* /CONTRIBUTING.rst
* /release


The README file for PyPT MAY NOT be relicensed.

Expand All @@ -18,7 +23,7 @@ version in .pypt/ should reflect that.)
LICENSE
-------

Copyright © 2014, Chris “Kwpolska” Warrick.
Copyright © 2013-2015, Chris Warrick.
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
26 changes: 13 additions & 13 deletions .pypt/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
Python Project Template. INSERT TAGLINE HERE.™
===============================================
:Info: This is the README file for the Python Project Template.
:Author: Chris “Kwpolska” Warrick <[email protected]>
:Copyright: © 2014, Chris “Kwpolska” Warrick.
:Author: Chris Warrick <[email protected]>
:Copyright: © 2013-2015, Chris Warrick.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
:Date: 2014-01-01
:Version: 0.1.0
:Date: 2015-01-01
:Version: 1.0.5

.. index: README
.. image:: https://travis-ci.org/Kwpolska/python-project-template.png?branch=master
Expand Down Expand Up @@ -87,11 +87,12 @@ Getting up to speed in 15 easy steps
letters if you feel like it, but it is discouraged and was not tested.
3. ``python-project-template`` with the GitHub repo name
4. ``INSERT TAGLINE HERE.`` with a tagline of your choice
5. ``kwpolska@.*`` with your e-mail address
6. ``Kwpolska`` and/or ``Chris “Kwpolska” Warrick`` with your name (affects mostly copyright notices)
5. ``[email protected]`` with your e-mail address
6. ``Kwpolska`` and/or ``Chris Warrick`` with your name (affects mostly copyright notices)

Not excluding dotfiles results in changing BSD-licensed files of the PyPT,
doing so is not allowed.
WARNING: some files are in the copyright of Chris Warrick and must stay this
way! They are listed in the license, please keep my name there, otherwise
you risk breaking the law.

Also, if ``len(computer_friendly_name) != len('tEmplate')``, you may want to
change the amount of tildes in docstrings of Python files.
Expand Down Expand Up @@ -136,14 +137,11 @@ Getting up to speed in 15 easy steps
git flow init #(change version tag prefix to `v`)
git add *
git checkout develop
git commit -sm 'initial commit via Kwpolska’s Python Project Template'
git commit -sm 'initial commit via @Kwpolska’s Python Project Template'
git checkout master
git merge --ff-only develop
git push -u origin master develop

Note that the above is likely to be replaced with an automated script at some
point.

COPYRIGHT
---------

Expand All @@ -158,11 +156,13 @@ commercial (a.k.a. proprietary) license, you must contact me first.
* /.pypt/localegen
* /.pypt/README.PyPT
* /.pypt/LICENSE.PyPT
* /docs/CONTRIBUTING.rst
* /CONTRIBUTING.rst
* /release

**This README file MAY NOT be relicensed.**

Copyright © 2014, Chris “Kwpolska” Warrick.
Copyright © 2013-2015, Chris Warrick.
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
7 changes: 4 additions & 3 deletions .pypt/aursend
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/usr/bin/python
# -*- encoding: utf-8 -*-
# Kw’s Release Tools/Python Project Template
# AUR Uploader
# Copyright © 2014, Kwpolska.
# Copyright © 2013-2015, Chris Warrick.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -38,11 +39,11 @@ import sys
import tarfile

# This was nicely stolen from PKGBUILDer.
CATEGORIES = ['ERROR', 'none', 'daemons', 'devel', 'editors',
CATEGORIES = ['none', 'none', 'daemons', 'devel', 'editors',
'emulators', 'games', 'gnome', 'i18n', 'kde',
'lib', 'modules', 'multimedia', 'network',
'office', 'science', 'system', 'x11',
'xfce', 'kernels']
'xfce', 'kernels', 'wayland']

AURURL = 'https://aur.archlinux.org/'
SESSION = requests.Session()
Expand Down
3 changes: 2 additions & 1 deletion .pypt/commitlog
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/usr/bin/python
# -*- encoding: utf-8 -*-
# Kw’s Release Tools/Python Project Template
# Commit and Changelog Parser
# Copyright © 2014, Kwpolska.
# Copyright © 2013-2015, Chris Warrick.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Expand Down
6 changes: 3 additions & 3 deletions .pypt/localegen
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/zsh
# Kw’s Release Tools/Python Project Template
# Locale Generator
# Copyright © 2014, Chris Warrick.
# Copyright © 2013-2015, Chris Warrick.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -45,9 +45,9 @@ case "$LOCALETYPE" in
sed '1,+17d' ./messages.pot > ./messages.pot.tmp

pot='# '$PROJECT' pot file.
# Copyright © 2011-2014, Chris Warrick.
# Copyright © 2015, Chris Warrick.
# This file is distributed under the same license as the '$PROJECT' package.
# Chris Warrick <[email protected]>, 2011-2014.
# Chris Warrick <[email protected]>, 2015.
#
msgid ""
msgstr ""
Expand Down
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Chris “Kwpolska” Warrick <[email protected]>
Chris Warrick <[email protected]>
4 changes: 2 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
Appendix C. Changelog
=====================
:Info: This is the changelog for PKGBUILDer.
:Author: Chris “Kwpolska” Warrick <[email protected]>
:Copyright: © 2011-2014, Kwpolska.
:Author: Chris Warrick <[email protected]>
:Copyright: © 2011-2015, Chris Warrick.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
:Date: 2014-08-10
:Version: 3.3.2
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
==============================
Appendix A. Contribution rules
==============================
:Author: Chris “Kwpolska” Warrick <[email protected]>
:Copyright: © 2011-2014, Kwpolska.
:Author: Chris Warrick <[email protected]>
:Copyright: © 2011-2015, Chris Warrick.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
:Date: 2014-08-10
:Version: 3.3.2
Expand Down
5 changes: 2 additions & 3 deletions INSTALL.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/python3
# -*- encoding: utf-8 -*-
# PKGBUILDer installer
# Copyright (C) 2011-2012, Kwpolska.
# Copyright (C) 2011-2015, Chris Warrick.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -52,8 +52,7 @@ def depcheck():

print(_("""Performing a dependency check..."""))

deps = {'pyalpm': None,
'certifi': None, 'requests': None}
deps = {'pyalpm': None, 'requests': None}

print("""pyalpm | extra | """, end='')
try:
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright © 2011-2014, Chris “Kwpolska” Warrick.
Copyright © 2011-2015, Chris Warrick.
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Maintainer: Chris “Kwpolska” Warrick <[email protected]>
# Maintainer: Chris Warrick <[email protected]>
pkgname=pkgbuilder
_pyname=pkgbuilder
pkgver=3.3.2
Expand Down
2 changes: 1 addition & 1 deletion PKGBUILD-git
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Maintainer: Chris “Kwpolska” Warrick <[email protected]>
# Maintainer: Chris Warrick <[email protected]>
pkgname=pkgbuilder-git
_pyname=pkgbuilder
_gitname=pkgbuilder
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
PKGBUILDer. An AUR helper (and library) in Python 3.
=====================================================
:Info: This is the README file for PKGBUILDer.
:Author: Chris “Kwpolska” Warrick <[email protected]>
:Author: Chris Warrick <[email protected]>
:Date: 2014-08-10
:Version: 3.3.2

Expand All @@ -23,7 +23,7 @@ For more info, refer to the pkgbuilder(8) man page or the documentation.

COPYRIGHT
---------
Copyright © 2011-2014, Chris “Kwpolska” Warrick.
Copyright © 2011-2015, Chris Warrick.
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
Binary file added locale/ar/LC_MESSAGES/pkgbuilder.mo
Binary file not shown.
11 changes: 5 additions & 6 deletions locale/ar/LC_MESSAGES/pkgbuilder.po
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
# PKGBUILDer pot file.
# Copyright © 2011-2014, Kwpolska.
# Copyright © 2015, Chris Warrick.
# This file is distributed under the same license as the PKGBUILDer package.
# Kwpolska <[email protected]>, 2011-2014.
#
# Translators:
msgid ""
msgstr ""
"Project-Id-Version: PKGBUILDer\n"
"Report-Msgid-Bugs-To: Kwpolska <[email protected]>\n"
"POT-Creation-Date: 2014-12-26 20:51+0100\n"
"Report-Msgid-Bugs-To: Chris Warrick <[email protected]>\n"
"POT-Creation-Date: 2014-12-27 11:56+0100\n"
"PO-Revision-Date: 2014-12-26 19:51+0000\n"
"Last-Translator: Chris Warrick <[email protected]>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/pkgbuilder/language/ar/)\n"
Expand Down Expand Up @@ -490,13 +489,13 @@ msgstr ""
msgid "no"
msgstr ""

#: pkgbuilder/wrapper.py:102
#: pkgbuilder/wrapper.py:101
#, python-format
msgid "%(prog)s <operation> [...]"
msgstr ""

#. TRANSLATORS: see pacman’s localizations
#: pkgbuilder/wrapper.py:269
#: pkgbuilder/wrapper.py:268
#, python-brace-format
msgid ""
"usage: {0} <operation> [...]\n"
Expand Down
Binary file added locale/de/LC_MESSAGES/pkgbuilder.mo
Binary file not shown.
11 changes: 5 additions & 6 deletions locale/de/LC_MESSAGES/pkgbuilder.po
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
# PKGBUILDer pot file.
# Copyright © 2011-2014, Kwpolska.
# Copyright © 2015, Chris Warrick.
# This file is distributed under the same license as the PKGBUILDer package.
# Kwpolska <[email protected]>, 2011-2014.
#
# Translators:
# Max Mustermann <[email protected]>, 2013
msgid ""
msgstr ""
"Project-Id-Version: PKGBUILDer\n"
"Report-Msgid-Bugs-To: Kwpolska <[email protected]>\n"
"POT-Creation-Date: 2014-12-26 20:51+0100\n"
"Report-Msgid-Bugs-To: Chris Warrick <[email protected]>\n"
"POT-Creation-Date: 2014-12-27 11:56+0100\n"
"PO-Revision-Date: 2014-12-26 19:51+0000\n"
"Last-Translator: Chris Warrick <[email protected]>\n"
"Language-Team: German (http://www.transifex.com/projects/p/pkgbuilder/language/de/)\n"
Expand Down Expand Up @@ -491,13 +490,13 @@ msgstr "Ja"
msgid "no"
msgstr "Nein"

#: pkgbuilder/wrapper.py:102
#: pkgbuilder/wrapper.py:101
#, python-format
msgid "%(prog)s <operation> [...]"
msgstr ""

#. TRANSLATORS: see pacman’s localizations
#: pkgbuilder/wrapper.py:269
#: pkgbuilder/wrapper.py:268
#, python-brace-format
msgid ""
"usage: {0} <operation> [...]\n"
Expand Down
Binary file modified locale/es/LC_MESSAGES/pkgbuilder.mo
Binary file not shown.
Loading

0 comments on commit 6846e85

Please sign in to comment.