Commits June 2019

commits@lists.geany.org

1 participants
70 discussions

[geany/www.geany.org] c01822: templates/home.html:correct spelling of "hobbyists"
by andy5995 25 Jun '19

25 Jun '19

Branch: refs/heads/master Author: andy5995 <andy400-dev(a)yahoo.com> Committer: andy5995 <andy400-dev(a)yahoo.com> Date: Tue, 25 Jun 2019 16:55:00 UTC Commit: c01822acc68bf490157c714fdbd38ea621a96d53 https://github.com/geany/www.geany.org/commit/c01822acc68bf490157c714fdbd38… Log Message: ----------- templates/home.html:correct spelling of "hobbyists" Modified Paths: -------------- geany/templates/home.html Modified: geany/templates/home.html 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -133,7 +133,7 @@ <h2 class="text-center">Great Community</h2> Using the <a href="http://www.gnu.org/licenses/gpl-2.0.txt">GPL v2 license</a>, Geany assures that not only can you customize and hack it, but that everyone benefits from changes the community makes. Geany - has a vibrant community of professionals and hobbiests alike + has a vibrant community of professionals and hobbyists alike that contribute improvements and fixes across numerous platforms including <a href="{% url "page" "support/mailing-lists" %}">The Mailing Lists</a>, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-themes] 2780c5: Change thumbnail size in the index to 128x128 pixels
by Matthew Brush 23 Jun '19

23 Jun '19

Branch: refs/heads/larger-thumbnails Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Sun, 23 Jun 2019 20:21:58 UTC Commit: 2780c5fbc5ade53f5bea2f894e8e9fce371f47d8 https://github.com/geany/geany-themes/commit/2780c5fbc5ade53f5bea2f894e8e9f… Log Message: ----------- Change thumbnail size in the index to 128x128 pixels Also, since I can't remember where the screenshot-missing.png icon came from, replace it with the 'image missing' icon from Tango[0] [0]: https://commons.wikimedia.org/wiki/Tango_icons#/media/File:Image-missing.svg Modified Paths: -------------- index/README.md index/index.json index/index.json.md5 screenshots/screenshot-missing.png scripts/mkindex.py Modified: index/README.md 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -4,7 +4,7 @@ Geany Themes Index File README The `index.json` file is auto-generated using the `make index` command. The `index` rule of the Makefile runs the `scripts/mkindex.py` script which reads the colour schemes' info, generates screenshot and download -URLs, base64 encoded 64x64 thumbnails and stores it all into a JSON +URLs, base64 encoded 128x128 thumbnails and stores it all into a JSON formatted text file. File Format @@ -73,12 +73,12 @@ image. #### thumbnail -This is a thumbnail image, 64 pixels wide and 64 pixels high, in PNG +This is a thumbnail image, 128 pixels wide and 128 pixels high, in PNG format, base64 encoded (for storing in text file). This is a small icon of the preview screenshot suitable for displaying for example in a GUI list of schemes. This maybe be an empty string if the colour scheme doesn't have a screenshot or it maybe be a generic "screenshit missing" -icon that is 64 pixels wide and tall. +icon that is 128 pixels wide and tall. #### version Modified: index/index.json 72 lines changed, 36 insertions(+), 36 deletions(-) =================================================================== No diff available, check online Modified: index/index.json.md5 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1 +1 @@ -f8100bdab45f1627a33bde393dbb63f1 index.json +861793e9be8d3f9ca27dcda0ce5caa95 index.json Modified: screenshots/screenshot-missing.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: scripts/mkindex.py 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -14,6 +14,7 @@ import StringIO from PIL import Image, ImageDraw, ImageOps, ImageFilter +THUMBNAIL_SIZE = (128, 128) SCREENSHOT_BASE = 'https://raw.github.com/geany/geany-themes/master/screenshots/' SCHEMES_BASE = 'https://raw.github.com/geany/geany-themes/master/colorschemes/' @@ -36,7 +37,7 @@ def generate_thumbnail(conf_fn, screenshot_dir='screenshots'): else: img = Image.open(png_file) img = img.crop((2,2,img.size[1]-2,img.size[1]-2)) - img.thumbnail((64,64), Image.ANTIALIAS) + img.thumbnail(THUMBNAIL_SIZE, Image.ANTIALIAS) #-- set to True to save thumbs into screenshots/.thumbs do_thumbs = False if do_thumbs: -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] e90042: Add Geany-Themes page with theme preview
by Enrico Tröger 23 Jun '19

23 Jun '19

Branch: refs/heads/issue5_geany_themes_preview Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 23 Jun 2019 17:30:04 UTC Commit: e90042b42918bb8917b0b25b38f3aaac159dd41e https://github.com/geany/www.geany.org/commit/e90042b42918bb8917b0b25b38f3a… Log Message: ----------- Add Geany-Themes page with theme preview The themes in the preview list are loaded from the Geany-Themes repository on Github on the fly (but cached for one hour). Modified Paths: -------------- page_content/download/themes.md static_docs/github_client.py static_docs/templates/pages/download/themes.html static_docs/urls.py static_docs/views.py Modified: page_content/download/themes.md 10 lines changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,10 @@ +## Geany Themes + +Geany-Themes is a collection of color schemes for Geany, either written originally by the Geany community or ported from color schemes for other editors. +These schemes are compatible with Geany 1.22 and greater. + +To use one the themes below, download the configuration file and save it to the folder `colorschemes` in your Geany configuration directory (usually `~/.config/geany/colorschemes/`). + +For more information and detailed configuration instructions, see https://github.com/geany/geany-themes. + + Modified: static_docs/github_client.py 8 lines changed, 5 insertions(+), 3 deletions(-) =================================================================== @@ -30,9 +30,11 @@ class GitHubApiClient: """""" # ---------------------------------------------------------------------- - def get_file_contents(self, filename): - url_parameters = dict(user=GITHUB_USER, - repository=GITHUB_REPOSITORY, + def get_file_contents(self, filename, user=None, repository=None): + user = user or GITHUB_USER + repository = repository or GITHUB_REPOSITORY + url_parameters = dict(user=user, + repository=repository, filename=filename) url = 'https://api.github.com/repos/%(user)s/%(repository)s/contents/%(filename)s' % \ url_parameters Modified: static_docs/templates/pages/download/themes.html 63 lines changed, 63 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,63 @@ +{% extends "pages/richtextpage.html" %} + +{% load mezzanine_tags pages_tags static %} + +{% block extra_css %} +<link rel="stylesheet" href="{% static "mezzanine/css/magnific-popup.css" %}"> +<style> + .img-thumbnail { + cursor: zoom-in; + } +</style> +{% endblock %} + +{% block richtext_content %} +{{ block.super }} + +<h3>Available Themes</h3> + +<div class="row"> + +{% for theme in theme_index.values|dictsort:"name" %} + <div class="col-md-4"> + <div class="panel panel-default"> + <div class="panel-heading"> + <strong>{{ theme.name }}</strong> + <span class="pull-right"><a href="{{ theme.colorscheme }}">Download</a></span> + </div> + <div class="panel-body gallery"> + <a href="{{ theme.screenshot }}" title="{{ theme.name }} - {{ theme.description }}"> + <img + src="data:image/png;base64,{{ theme.thumbnail }}" + class="img-responsive img-thumbnail center-block" + alt="Thumbnail of colorscheme {{ theme.name }}" /> + </a> + <div class="text-center">{{ theme.description }}</div> + </div> + </div> + </div> + + {% if forloop.counter|divisibleby:3 %} + </div> + <div class="row"> + {% endif %} +{% endfor %} +</div> + +{% endblock %} + +{% block extra_js %} +{{ block.super }} +<script src="{% static "mezzanine/js/magnific-popup.js" %}"></script> +<script> +$(document).ready(function() { + $('.gallery').magnificPopup({ + delegate: 'a', + type: 'image', + gallery: { + enabled: true, + } + }); +}); +</script> +{% endblock %} Modified: static_docs/urls.py 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -14,10 +14,12 @@ from django.conf.urls import url -from static_docs.views import I18NStatisticsView, ReleaseNotesView, ToDoView +from static_docs.views import I18NStatisticsView, ReleaseNotesView, ThemesView, ToDoView urlpatterns = ( # pylint: disable=invalid-name + url(r'^download/themes/$', ThemesView.as_view(), name='themes'), + url(r'^documentation/todo/$', ToDoView.as_view(), name='todo'), url(r'^documentation/releasenotes/$', ReleaseNotesView.as_view(), name='releasenotes'), Modified: static_docs/views.py 29 lines changed, 27 insertions(+), 2 deletions(-) =================================================================== @@ -56,9 +56,9 @@ def __init__(self, *args, **kwargs): self._file_contents = None # ---------------------------------------------------------------------- - def _fetch_file_via_github_api(self, filename): + def _fetch_file_via_github_api(self, filename, user=None, repository=None): client = GitHubApiClient() - self._file_contents = client.get_file_contents(filename) + self._file_contents = client.get_file_contents(filename, user=user, repository=repository) class ReleaseNotesView(StaticDocsView): @@ -240,3 +240,28 @@ def _get_i18n_statistics(self): settings.STATIC_DOCS_GEANY_I18N_STATISTICS_FILENAME) with open(filename) as input_file: return json.load(input_file) + + +class ThemesView(StaticDocsView): + """ + Fetch the Geany-Themes index from https://github.com/geany/geany-themes/tree/master/index + """ + + template_name = "pages/download/themes.html" + + # ---------------------------------------------------------------------- + def get_context_data(self, **kwargs): + theme_index = self._get_theme_index() + context = super(ThemesView, self).get_context_data(**kwargs) + context['theme_index'] = theme_index + return context + + # ---------------------------------------------------------------------- + @cache_function(CACHE_TIMEOUT_1HOUR) + def _get_theme_index(self): + self._fetch_file_via_github_api('index/index.json', repository='geany-themes') + return self._parse_themes_index() + + # ---------------------------------------------------------------------- + def _parse_themes_index(self): + return json.loads(self._file_contents) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] ab121c: Fix line number of silenced warning
by Enrico Tröger 23 Jun '19

23 Jun '19

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 23 Jun 2019 15:33:36 UTC Commit: ab121cfad689cfa45e79300ca29fbe6ca3e9e8af https://github.com/geany/www.geany.org/commit/ab121cfad689cfa45e79300ca29fb… Log Message: ----------- Fix line number of silenced warning The previous line number was of a different development version. Modified Paths: -------------- geany/settings.py Modified: geany/settings.py 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -582,7 +582,7 @@ message='^mezzanine_pagedown.filters.custom needs to ensure that any untrusted inputs.*', category=FutureWarning, module='mezzanine.core.templatetags.mezzanine_tags', - lineno=492) + lineno=488) ################## # LOCAL SETTINGS # -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] 9d8197: Run linting and static code analysis with Tox and Travis
by Enrico Tröger 23 Jun '19

23 Jun '19

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 23 Jun 2019 15:25:51 UTC Commit: 9d8197be9e0e779f5b4829b460a0b77b2849293e https://github.com/geany/www.geany.org/commit/9d8197be9e0e779f5b4829b460a0b… Log Message: ----------- Run linting and static code analysis with Tox and Travis Still no unit tests but at least linting checks and PyLint. Modified Paths: -------------- .travis.yml tox.ini Modified: .travis.yml 26 lines changed, 26 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,26 @@ +# LICENCE: This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +os: linux +dist: xenial +sudo: false +language: python +cache: pip + +python: + - "3.5" + - "3.6" + - "3.7" + +install: pip install tox-travis +script: tox Modified: tox.ini 84 lines changed, 84 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,84 @@ +# LICENCE: This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +[tox] +skip_missing_interpreters = true +skipsdist = true +envlist = + py35,py36,py37 + +geany_modules = geany latest_version news nightlybuilds pastebin static_docs + +[testenv] +deps = + flake8 + isort + pylint + pylint-django + -r{toxinidir}/requirements.txt +commands = + {envbindir}/flake8 {[tox]geany_modules} + {envbindir}/isort --check-only --diff --recursive {[tox]geany_modules} + {envbindir}/pylint --rcfile=tox.ini {[tox]geany_modules} + +[flake8] +exclude = build,.git,docs,local_settings.py +ignore = E127,E128, +max-line-length = 100 + +[isort] +line_length = 100 +indent = 4 +multi_line_output = 3 +length_sort = false +force_alphabetical_sort_within_sections = true +sections = FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER +lines_after_imports = 2 +from_first = true +include_trailing_comma = true +skip = local_settings.py + +# the following secions are for pylint +[MASTER] +ignore=.git +ignore-patterns=local_settings.py +persistent=no +load-plugins=pylint_django + +[MESSAGES CONTROL] +disable= + empty-docstring, + logging-format-interpolation, + missing-docstring, + no-else-return, + no-self-use + +[REPORTS] +output-format=parseable +files-output=no +reports=no + +[FORMAT] +max-line-length=100 + +[VARIABLES] +dummy-variables-rgx=_|dummy + +[DESIGN] +min-public-methods=0 +max-attributes=10 +max-args=7 +max-parents=9 + +[EXCEPTIONS] +overgeneral-exceptions= -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] 1dc453: Document why NakedHtmlFormatter exists
by Enrico Tröger 23 Jun '19

23 Jun '19

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 23 Jun 2019 15:15:23 UTC Commit: 1dc453bfcf46c6dbe8058c6a3a889070063580ba https://github.com/geany/www.geany.org/commit/1dc453bfcf46c6dbe8058c6a3a889… Log Message: ----------- Document why NakedHtmlFormatter exists Also rename an argument name to fix a PyLint warning about different argument names. Modified Paths: -------------- pastebin/highlight.py Modified: pastebin/highlight.py 5 lines changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -50,14 +50,15 @@ class NakedHtmlFormatter(HtmlFormatter): + """Do not wrap the code in <div> or <code> tags (Pygments default)""" # ---------------------------------------------------------------------- def wrap(self, source, outfile): return self._wrap_code(source) # ---------------------------------------------------------------------- - def _wrap_code(self, source): - for code, text in source: + def _wrap_code(self, inner): + for code, text in inner: yield code, text -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/infrastructure] cf33cd: Add GPLv2 license text and add missing license references in scripts
by Enrico Tröger 23 Jun '19

23 Jun '19

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 23 Jun 2019 11:34:55 UTC Commit: cf33cd8020337c5596e88c00b71cb4e03349ac24 https://github.com/geany/infrastructure/commit/cf33cd8020337c5596e88c00b71c… Log Message: ----------- Add GPLv2 license text and add missing license references in scripts Closes #4. Modified Paths: -------------- COPYING README.md github-backup/backup.sh github-backup/create_or_update_virtualenv.sh scripts/git_hooks/garbage_collect_repositories.sh Modified: COPYING 340 lines changed, 340 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Modified: README.md 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -65,3 +65,9 @@ In the directory ircbot-plugins there are two plugins for the IRC bot Supybot The plugins enhance the used Supybot instance on #geany by various useful and funny features like a bunch of !commands. For details, read the source code. + + +License +=============== +Unless stated otherwise all code in this repository is licensed of under the terms +of the GNU General Public License version 2 (see COPYING in this repository). Modified: github-backup/backup.sh 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ #!/bin/sh - +# +# Author: Enrico Tröger +# License: GPLv2 +# # backup almost everything from Github except the GIT repositories itself as we have git.geany.org # read the token Modified: github-backup/create_or_update_virtualenv.sh 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ #!/bin/sh - +# +# Author: Enrico Tröger +# License: GPLv2 +# # initial setup of the Python virtualenv for github-backup (github.com/josegonzalez/python-github-backup) # or just update it if it already exists Modified: scripts/git_hooks/garbage_collect_repositories.sh 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,8 @@ #!/bin/bash - +# +# Author: Enrico Tröger +# License: GPLv2 +# # Geany GIT mirror repository cleaner (executed once a week as cronjob) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] e8ec8a: Improve trailing slash handling in legacy URL mapping
by Enrico Tröger 23 Jun '19

23 Jun '19

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 23 Jun 2019 11:08:00 UTC Commit: e8ec8ada06bf6f2f30fa364a6675bb44a0162b32 https://github.com/geany/www.geany.org/commit/e8ec8ada06bf6f2f30fa364a6675b… Log Message: ----------- Improve trailing slash handling in legacy URL mapping The trailing slash only variant didn't work in all cases, so explicitly add both variants to the final URL mapping. Modified Paths: -------------- geany/urls_legacy.py Modified: geany/urls_legacy.py 122 lines changed, 64 insertions(+), 58 deletions(-) =================================================================== @@ -18,66 +18,66 @@ URL_MAPPING = { # old urls mapped to new ones - '/Category/DocumentationToDo/': 'https://github.com/geany/geany/issues/', - '/Category/Manual/': '/documentation/manual/', - '/Contribute/Developers/': '/contribute/development/', - '/Contribute/Documentation/': '/contribute/documentation/', - '/Contribute/Support/': '/contribute/support/', - '/Contribute/Translators/': '/contribute/translation/', - '/i18n/': '/contribute/translation/statistics/', - '/Developers/Developers/': '/contribute/development/', - '/Documentation/ChangeLog/': 'https://github.com/geany/geany/commits/master', # page dropped - '/Documentation/Documentation/': '/documentation/manual/', - '/Documentation/FAQ/': '/documentation/faq/', - '/Documentation/FAQdata/': '/documentation/faq/', - '/Documentation/Manual/': '/documentation/manual/', - '/Documentation/Questions/': '/documentation/faq/', - '/Documentation/ReleaseNotes/': '/documentation/releasenotes/', - '/Documentation/ReleaseNotesOld/': '/documentation/releasenotes/', - '/Documentation/Screenshots/': '/documentation/screenshots/', - '/Documentation/ToDo/': 'https://github.com/geany/geany/issues/', - '/Download/Extras/': 'https://wiki.geany.org/', # page dropped - '/Download/Git/': '/download/git/', - '/Download/OldExtras/': 'https://wiki.geany.org/', # page dropped - '/Download/': '/download/releases/', - '/Download/Releases/': '/download/releases/', - '/Download/SVN/': '/download/git/', - '/Download/ThirdPartyPackages/': '/download/third-party/', - '/Gallery/Main/': '/documentation/screenshots/', - '/Gallery/Test/': '/documentation/screenshots/', - '/Geany/ChangeLog/': 'https://github.com/geany/geany/commits/master', # page dropped - '/Geany/FAQ/': '/documentation/faq/', - '/Geany/Screenshots/': '/documentation/screenshots/', - '/Geany/Support/': '/support/', - '/Geany/Troubleshooting/': '/support/', - '/Main/About/': '/about/geany/', - '/Main/AboutThisSite/': '/', - '/Main/AllFiletypes/': '/about/filetypes/', - '/Main/Authors/': '/about/geany/', - '/Main/Blog/': '/news/', - '/Main/BlogArchive/': '/news/', - '/Main/HomePage/': '/', - '/main/homepage/': '/', - '/Main/Reviews/': '/', # page dropped - '/Main/Thanks/': '/', # page dropped - '/Main/WikiSandbox/': '/', # page dropped - '/Site/AllRecentChanges/': '/news/feed/', - '/Site/Authors/': '/about/geany/', - '/Support/Bugs/': '/support/bugs/', - '/Support/BuildingFromSource/': 'https://www.geany.org/manual/index.html#installation', - '/Support/BuildingOnWin32/': 'https://wiki.geany.org/howtos/win32/msys2', - '/Support/Contributions/': '/contribute/', - '/Support/CrossCompile/': 'https://wiki.geany.org/howtos/win32/crosscompile', - '/Support/Developers/': '/contribute/development/', - '/Support/Hacking/': '/documentation/hacking/', - '/Support/I18N/': '/contribute/translation/', - '/Support/IRC/': '/support/irc/', - '/Support/MailingList/': '/support/mailing-lists/', + '/Category/DocumentationToDo': 'https://github.com/geany/geany/issues/', + '/Category/Manual': '/documentation/manual/', + '/Contribute/Developers': '/contribute/development/', + '/Contribute/Documentation': '/contribute/documentation/', + '/Contribute/Support': '/contribute/support/', + '/Contribute/Translators': '/contribute/translation/', + '/i18n': '/contribute/translation/statistics/', + '/Developers/Developers': '/contribute/development/', + '/Documentation/ChangeLog': 'https://github.com/geany/geany/commits/master', # page dropped + '/Documentation/Documentation': '/documentation/manual/', + '/Documentation/FAQ': '/documentation/faq/', + '/Documentation/FAQdata': '/documentation/faq/', + '/Documentation/Manual': '/documentation/manual/', + '/Documentation/Questions': '/documentation/faq/', + '/Documentation/ReleaseNotes': '/documentation/releasenotes/', + '/Documentation/ReleaseNotesOld': '/documentation/releasenotes/', + '/Documentation/Screenshots': '/documentation/screenshots/', + '/Documentation/ToDo': 'https://github.com/geany/geany/issues/', + '/Download/Extras': 'https://wiki.geany.org/', # page dropped + '/Download/Git': '/download/git/', + '/Download/OldExtras': 'https://wiki.geany.org/', # page dropped + '/Download': '/download/releases/', + '/Download/Releases': '/download/releases/', + '/Download/SVN': '/download/git/', + '/Download/ThirdPartyPackages': '/download/third-party/', + '/Gallery/Main': '/documentation/screenshots/', + '/Gallery/Test': '/documentation/screenshots/', + '/Geany/ChangeLog': 'https://github.com/geany/geany/commits/master', # page dropped + '/Geany/FAQ': '/documentation/faq/', + '/Geany/Screenshots': '/documentation/screenshots/', + '/Geany/Support': '/support/', + '/Geany/Troubleshooting': '/support/', + '/Main/About': '/about/geany/', + '/Main/AboutThisSite': '/', + '/Main/AllFiletypes': '/about/filetypes/', + '/Main/Authors': '/about/geany/', + '/Main/Blog': '/news/', + '/Main/BlogArchive': '/news/', + '/Main/HomePage': '/', + '/main/homepage': '/', + '/Main/Reviews': '/', # page dropped + '/Main/Thanks': '/', # page dropped + '/Main/WikiSandbox': '/', # page dropped + '/Site/AllRecentChanges': '/news/feed/', + '/Site/Authors': '/about/geany/', + '/Support/Bugs': '/support/bugs/', + '/Support/BuildingFromSource': 'https://www.geany.org/manual/index.html#installation', + '/Support/BuildingOnWin32': 'https://wiki.geany.org/howtos/win32/msys2', + '/Support/Contributions': '/contribute/', + '/Support/CrossCompile': 'https://wiki.geany.org/howtos/win32/crosscompile', + '/Support/Developers': '/contribute/development/', + '/Support/Hacking': '/documentation/hacking/', + '/Support/I18N': '/contribute/translation/', + '/Support/IRC': '/support/irc/', + '/Support/MailingList': '/support/mailing-lists/', '/Support/PluginWishlist/': 'https://github.com/geany/geany-plugins/issues?q=is%%3Aissue+label%%3Afeatur…', - '/Support/Plugins/': '/support/plugins/', - '/Support/RunningOnWindows/': 'https://wiki.geany.org/howtos/win32/running', - '/Support/VerifyGPGSignature/': '/support/verify-gpg-signature/', + '/Support/Plugins': '/support/plugins/', + '/Support/RunningOnWindows': 'https://wiki.geany.org/howtos/win32/running', + '/Support/VerifyGPGSignature': '/support/verify-gpg-signature/', # migrated news items '/Main/20060117': '/news/geany-in-linuxuser/', @@ -191,6 +191,12 @@ def _add_url_mappings(mapping, urlpatterns_): r'^{}$'.format(old_url), RedirectView.as_view(url=new_url, permanent=True)) urlpatterns_.append(url_pattern) + # add pattern variant with trailing slash + if old_url[-1] != '/': + url_pattern = url( + r'^{}/$'.format(old_url), + RedirectView.as_view(url=new_url, permanent=True)) + urlpatterns_.append(url_pattern) urlpatterns = [] # pylint: disable=invalid-name -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] ef82ca: Add catch all URL mappings last to preserve the matching order
by Enrico Tröger 23 Jun '19

23 Jun '19

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 23 Jun 2019 11:02:34 UTC Commit: ef82cae07e0f470e29163a922b3c80ee4f44c857 https://github.com/geany/www.geany.org/commit/ef82cae07e0f470e29163a922b3c8… Log Message: ----------- Add catch all URL mappings last to preserve the matching order Modified Paths: -------------- geany/urls_legacy.py Modified: geany/urls_legacy.py 52 lines changed, 33 insertions(+), 19 deletions(-) =================================================================== @@ -79,19 +79,6 @@ '/Support/RunningOnWindows/': 'https://wiki.geany.org/howtos/win32/running', '/Support/VerifyGPGSignature/': '/support/verify-gpg-signature/', - # various old deep links (catch all) - '/images/.*.png/': '/media/uploads/screenshots/geany_light_2019-05-20.png', - '/uploads/Gallery/.*.png/': '/media/uploads/screenshots/geany_light_2019-05-20.png', - '/Category.*': '/', - '/Developers.*': '/', - '/Documentation.*': '/', - '/Download.*': '/', - '/Geany.*': '/', - '/PmWiki.*': '/', - '/Profiles.*': '/', - '/Site.*': '/', - '/Support.*': '/', - # migrated news items '/Main/20060117': '/news/geany-in-linuxuser/', '/Main/20060128': '/news/geany-05-is-out/', @@ -172,15 +159,42 @@ '/Main/20181216': '/news/geany-134-is-out/', '/Main/20190104': '/news/geany-1341-is-out/', '/Main/20190428': '/news/geany-135-is-out/', +} + + +URL_MAPPING_CATCH_ALL = { + # various old deep links (catch all) + '/images/.*.png/': '/media/uploads/screenshots/geany_light_2019-05-20.png', + '/uploads/Gallery/.*.png/': '/media/uploads/screenshots/geany_light_2019-05-20.png', + '/Category.*': '/', + '/Developers.*': '/', + '/Documentation.*': '/', + '/Download.*': '/', + '/Geany.*': '/', + '/PmWiki.*': '/', + '/Profiles.*': '/', + '/Site.*': '/', + '/Support.*': '/', + '/ToDo.*': '/', # catch all for everything else (spiders tend to query even non-existent URLs) '/Main/.*': '/news/geany-135-is-out/', } -urlpatterns = [] # pylint: disable=invalid-name -for old_url, new_url in URL_MAPPING.items(): - if old_url.startswith('/'): - old_url = old_url[1:] +# ---------------------------------------------------------------------- +def _add_url_mappings(mapping, urlpatterns_): + for old_url, new_url in mapping.items(): + if old_url.startswith('/'): + old_url = old_url[1:] + + url_pattern = url( + r'^{}$'.format(old_url), + RedirectView.as_view(url=new_url, permanent=True)) + urlpatterns_.append(url_pattern) - url_pattern = url(r'^{}$'.format(old_url), RedirectView.as_view(url=new_url, permanent=True)) - urlpatterns.append(url_pattern) + +urlpatterns = [] # pylint: disable=invalid-name +# first add specific items to let them match first +_add_url_mappings(URL_MAPPING, urlpatterns) +# now add catch all items +_add_url_mappings(URL_MAPPING_CATCH_ALL, urlpatterns) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] a780df: Name the "sitemap.xml" URL to fix Django's auto detection
by Enrico Tröger 23 Jun '19

23 Jun '19

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 23 Jun 2019 09:37:39 UTC Commit: a780dfd36d3ed1993dc3672d523954ae67dac1ca https://github.com/geany/www.geany.org/commit/a780dfd36d3ed1993dc3672d52395… Log Message: ----------- Name the "sitemap.xml" URL to fix Django's auto detection This is necessary for the "ping_google" management command. Modified Paths: -------------- geany/urls.py Modified: geany/urls.py 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -48,7 +48,7 @@ # Geany patterns urlpatterns += ( # use our custom sitemap implementation - url(r"^sitemap\.xml$", sitemap, sitemaps), + url(r"^sitemap\.xml$", sitemap, sitemaps, name='django.contrib.sitemaps.views.sitemap'), # Release Notes, NEWS, etc. url(r"^", include("static_docs.urls")), -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2019