]> git.ipfire.org Git - thirdparty/jinja.git/log
thirdparty/jinja.git
5 years agoadd chars option to trim 828/head
Matteo Ferrando [Wed, 21 Mar 2018 16:47:46 +0000 (12:47 -0400)] 
add chars option to trim

5 years agoMerge branch '2.10.x'
David Lord [Fri, 4 Oct 2019 18:22:50 +0000 (11:22 -0700)] 
Merge branch '2.10.x'

5 years agorelease version 2.10.2 2.10.2
David Lord [Fri, 4 Oct 2019 18:18:56 +0000 (11:18 -0700)] 
release version 2.10.2

5 years agoupdate project metadata
David Lord [Fri, 4 Oct 2019 18:17:12 +0000 (11:17 -0700)] 
update project metadata

5 years agoMerge pull request #1000 from EtiennePelletier/fix_deadlock_improve_tests
David Lord [Fri, 4 Oct 2019 15:30:39 +0000 (08:30 -0700)] 
Merge pull request #1000 from EtiennePelletier/fix_deadlock_improve_tests

Fix deadlock in LRUCache and improve test coverage

5 years agoAdd tests for Undefined classes 1000/head
EtiennePelletier [Thu, 9 May 2019 20:50:47 +0000 (16:50 -0400)] 
Add tests for Undefined classes

5 years agoAdd tests for utils.py - LRUCache, Lorem Ipsum & +
EtiennePelletier [Thu, 9 May 2019 20:49:50 +0000 (16:49 -0400)] 
Add tests for utils.py - LRUCache, Lorem Ipsum & +

5 years agoPrevent deadlock in LRUCache.setdefault
EtiennePelletier [Thu, 9 May 2019 20:47:54 +0000 (16:47 -0400)] 
Prevent deadlock in LRUCache.setdefault

setdefault was acquiring write_lock, then calling getitem and also
potentially setitem, which also both try to acquire the write lock.

5 years agoMerge pull request #1040 from minho42/Simplify-import-split
David Lord [Fri, 4 Oct 2019 14:42:43 +0000 (07:42 -0700)] 
Merge pull request #1040 from minho42/Simplify-import-split

Simplify splitting import_name in import_string()

5 years agoMerge pull request #1065 from alexwlchan/add-pypi-links
Joshua Bronson [Sun, 22 Sep 2019 19:29:08 +0000 (15:29 -0400)] 
Merge pull request #1065 from alexwlchan/add-pypi-links

Add docs, code and issue tracker links to setup.py

5 years agoAdd docs, code and issue tracker links to setup.py 1065/head
Alex Chan [Sun, 22 Sep 2019 08:52:15 +0000 (09:52 +0100)] 
Add docs, code and issue tracker links to setup.py

5 years agoMerge pull request #1063 from PikachuEXE/fix/manifest
Joshua Bronson [Fri, 20 Sep 2019 02:28:44 +0000 (22:28 -0400)] 
Merge pull request #1063 from PikachuEXE/fix/manifest

Fix MANIFEST.in to include renamed license file

5 years agoFix MANIFEST.in to include renamed license file 1063/head
PikachuEXE [Fri, 20 Sep 2019 02:16:11 +0000 (10:16 +0800)] 
Fix MANIFEST.in to include renamed license file

5 years agoFix simple typo: problemtic -> problematic (#1059)
Tim Gates [Wed, 4 Sep 2019 22:12:07 +0000 (08:12 +1000)] 
Fix simple typo: problemtic -> problematic (#1059)

Plus rephrase the comment for greater clarity.

5 years agoMerge branch '2.10.x'
David Lord [Wed, 4 Sep 2019 15:25:09 +0000 (08:25 -0700)] 
Merge branch '2.10.x'

5 years agoMerge pull request #1051 from vstinner/tb_next_py37
David Lord [Wed, 4 Sep 2019 14:48:06 +0000 (07:48 -0700)] 
Merge pull request #1051 from vstinner/tb_next_py37

Fix TracebackFrameProxy.set_next() on Python 3.7

5 years agoFix TracebackFrameProxy.set_next() on Python 3.7 1051/head
Victor Stinner [Mon, 19 Aug 2019 22:40:39 +0000 (00:40 +0200)] 
Fix TracebackFrameProxy.set_next() on Python 3.7

Fix issue #1050: fix a crash in TracebackFrameProxy.set_next() on
Python 3.7 and newer, when Python is build in debug mode.

Since Python 3.7, traceback.tb_next field can be modified: ctypes is
no longer needed.

5 years agoMerge pull request #1045 from yuriks/patch-1
Joshua Bronson [Fri, 9 Aug 2019 02:49:09 +0000 (22:49 -0400)] 
Merge pull request #1045 from yuriks/patch-1

Update PyPI link to point to Jinja2 instead of 1

5 years agoUpdate PyPI link to point to Jinja2 instead of 1 1045/head
Yuri Kunde Schlesner [Fri, 9 Aug 2019 00:14:03 +0000 (17:14 -0700)] 
Update PyPI link to point to Jinja2 instead of 1

6 years agoMerge branch '2.10.x'
David Lord [Fri, 26 Jul 2019 22:21:16 +0000 (15:21 -0700)] 
Merge branch '2.10.x'

6 years agofix tox docs build
David Lord [Fri, 26 Jul 2019 22:17:58 +0000 (15:17 -0700)] 
fix tox docs build

6 years agoMerge branch '2.9.x' into docs
David Lord [Fri, 26 Jul 2019 21:57:58 +0000 (14:57 -0700)] 
Merge branch '2.9.x' into docs

6 years agoMerge pull request #1042 from pallets/docs
David Lord [Fri, 26 Jul 2019 21:39:59 +0000 (14:39 -0700)] 
Merge pull request #1042 from pallets/docs

modernize docs, 2.9.x branch

6 years agoreformat readme 1042/head
David Lord [Fri, 26 Jul 2019 21:36:55 +0000 (14:36 -0700)] 
reformat readme

6 years agofix linkcheck issues
David Lord [Fri, 26 Jul 2019 19:12:41 +0000 (12:12 -0700)] 
fix linkcheck issues

6 years agomodernize docs config, use pallets-sphinx-themes
David Lord [Wed, 24 Jul 2019 21:18:02 +0000 (14:18 -0700)] 
modernize docs config, use pallets-sphinx-themes

6 years agoFix typo
Min ho Kim [Thu, 25 Jul 2019 13:28:26 +0000 (23:28 +1000)] 
Fix typo

6 years agoSimplify splitting import_name in import_string() 1040/head
Min ho Kim [Tue, 23 Jul 2019 23:55:04 +0000 (09:55 +1000)] 
Simplify splitting import_name in import_string()

6 years agoMerge pull request #1035 from utoddl/stable-sort-doc
David Lord [Tue, 23 Jul 2019 22:23:03 +0000 (15:23 -0700)] 
Merge pull request #1035 from utoddl/stable-sort-doc

document that sort is stable

6 years agoclean up sort filter docs 1035/head
David Lord [Tue, 23 Jul 2019 22:20:07 +0000 (15:20 -0700)] 
clean up sort filter docs

6 years agodocument that sort is stable
Todd Lewis [Thu, 18 Jul 2019 12:21:34 +0000 (08:21 -0400)] 
document that sort is stable

6 years agoMerge pull request #956 from revelt/patch-1
David Lord [Tue, 23 Jul 2019 21:54:57 +0000 (14:54 -0700)] 
Merge pull request #956 from revelt/patch-1

Tweak docs grouper chapter

6 years agoclean up groupby filter docs 956/head
David Lord [Tue, 23 Jul 2019 21:48:41 +0000 (14:48 -0700)] 
clean up groupby filter docs

6 years agoclarify groupby behavior in docs
Roy Revelt [Sat, 9 Mar 2019 11:23:39 +0000 (11:23 +0000)] 
clarify groupby behavior in docs

6 years agoMerge pull request #923 from CleoQc/feature/long_integer_with_underscores
David Lord [Tue, 23 Jul 2019 18:11:28 +0000 (11:11 -0700)] 
Merge pull request #923 from CleoQc/feature/long_integer_with_underscores

Feature/long integer with underscores

6 years agoclean up numeric underscore support 923/head
David Lord [Tue, 23 Jul 2019 18:07:09 +0000 (11:07 -0700)] 
clean up numeric underscore support

add changelog
clean up docs
parametrize tests
explain float regex

6 years agosupport underscore in int and float
CleoQc [Tue, 13 Nov 2018 00:43:13 +0000 (19:43 -0500)] 
support underscore in int and float

6 years agoMerge pull request #922 from CleoQc/feature/support_scientific_notation
David Lord [Tue, 23 Jul 2019 15:35:15 +0000 (08:35 -0700)] 
Merge pull request #922 from CleoQc/feature/support_scientific_notation

Feature/support scientific notation

6 years agoclean up scientific notation support 922/head
David Lord [Tue, 23 Jul 2019 15:19:51 +0000 (08:19 -0700)] 
clean up scientific notation support

add changelog
clean up docs
parametrize tests

6 years agosupport scientific notation
CleoQc [Mon, 12 Nov 2018 18:56:41 +0000 (13:56 -0500)] 
support scientific notation

6 years agoMerge pull request #961 from JulienPalard/TemplateNotFound
David Lord [Mon, 22 Jul 2019 17:50:37 +0000 (10:50 -0700)] 
Merge pull request #961 from JulienPalard/TemplateNotFound

Better repr for TemplateNotFound.

6 years agoMerge pull request #981 from pwlandoll/2.10.x
David Lord [Mon, 22 Jul 2019 17:47:32 +0000 (10:47 -0700)] 
Merge pull request #981 from pwlandoll/2.10.x

Add Links section to README

6 years agoMerge pull request #994 from bkiu/931-undeclared-variables
David Lord [Mon, 22 Jul 2019 17:46:50 +0000 (10:46 -0700)] 
Merge pull request #994 from bkiu/931-undeclared-variables

exclude globals from find_undeclared_variables

6 years agoexclude globals from find_undeclared_variables 994/head
Brendan [Tue, 7 May 2019 16:00:06 +0000 (12:00 -0400)] 
exclude globals from find_undeclared_variables

6 years agoMerge pull request #985 from bkiu/557-map-default
David Lord [Mon, 22 Jul 2019 17:39:23 +0000 (10:39 -0700)] 
Merge pull request #985 from bkiu/557-map-default

Adding a default parameter to builtin map filter

6 years agoMerge branch 'master' into 557-map-default 985/head
David Lord [Mon, 22 Jul 2019 16:45:20 +0000 (09:45 -0700)] 
Merge branch 'master' into 557-map-default

6 years agoAdding a default parameter to builtin map filter
Brendan [Mon, 6 May 2019 15:49:48 +0000 (11:49 -0400)] 
Adding a default parameter to builtin map filter

6 years agoMerge pull request #986 from pbjr23/fix-safe-range-memory
David Lord [Mon, 22 Jul 2019 15:34:09 +0000 (08:34 -0700)] 
Merge pull request #986 from pbjr23/fix-safe-range-memory

Fix memory usage bug in Python 2 by using correct version of range

6 years agosandbox uses xrange on Python 2 986/head
Prakhar Bhandari [Mon, 6 May 2019 16:00:53 +0000 (12:00 -0400)] 
sandbox uses xrange on Python 2

6 years agoMerge pull request #990 from tbnorth/vim_syntax_tweak
David Lord [Mon, 22 Jul 2019 14:55:11 +0000 (07:55 -0700)] 
Merge pull request #990 from tbnorth/vim_syntax_tweak

This is the correct thing to do, vim-wise, although whether

6 years agoMerge pull request #1018 from kbiggers/jinja/557
David Lord [Mon, 22 Jul 2019 14:42:04 +0000 (07:42 -0700)] 
Merge pull request #1018 from kbiggers/jinja/557

add default to map filter

6 years agoadd default to map filter 1018/head
Kevin [Fri, 31 May 2019 17:59:01 +0000 (13:59 -0400)] 
add default to map filter

6 years agoMerge pull request #1014 from markroth8/mroth/fix/748
David Lord [Sat, 20 Jul 2019 21:23:53 +0000 (14:23 -0700)] 
Merge pull request #1014 from markroth8/mroth/fix/748

Allow '{%+' to be valid syntax (but NOP) when lstrip_blocks == False. Fixes #748

6 years agoAllow '{%+' to be valid syntax (but NOP) when lstrip_blocks == False. Fixes #748. 1014/head
Mark Roth [Fri, 31 May 2019 22:52:45 +0000 (18:52 -0400)] 
Allow '{%+' to be valid syntax (but NOP) when lstrip_blocks == False. Fixes #748.

6 years agoMerge pull request #1022 from jdufresne/hl
David Lord [Sat, 20 Jul 2019 21:14:41 +0000 (14:14 -0700)] 
Merge pull request #1022 from jdufresne/hl

Correct syntax highlighting of jinja block in docs

6 years agoCorrect syntax highlighting of jinja block in docs 1022/head
Jon Dufresne [Fri, 21 Jun 2019 20:25:28 +0000 (13:25 -0700)] 
Correct syntax highlighting of jinja block in docs

6 years agoMerge branch '2.10.x'
David Lord [Sat, 20 Jul 2019 21:03:04 +0000 (14:03 -0700)] 
Merge branch '2.10.x'

6 years agoMerge pull request #1030 from rillian/PytestUnknownMarkWarning
David Lord [Sat, 20 Jul 2019 20:58:04 +0000 (13:58 -0700)] 
Merge pull request #1030 from rillian/PytestUnknownMarkWarning

Fix pytest unknown mark warnings

6 years agowarnings are errors during tests 1030/head
David Lord [Sat, 20 Jul 2019 20:56:23 +0000 (13:56 -0700)] 
warnings are errors during tests

6 years agoRegister custom test category markers.
Ralph Giles [Thu, 4 Jul 2019 20:24:51 +0000 (13:24 -0700)] 
Register custom test category markers.

Since around pytest 3.6 it's been possible to register custom
markers, and since version 4.5.0 pytest warns about any which
are not registered. Register a list of such markers, extracted
from those warnings, so they don't clutter the test output.

6 years agoignore coverage parse errors
David Lord [Sat, 20 Jul 2019 20:52:19 +0000 (13:52 -0700)] 
ignore coverage parse errors

Azure has Python 2.7.15 and Python 3.5.5, which can't parse async code.
Later patch versions can parse it fine, so this can be removed if
Azure updates.

6 years agoswitch tests to azure pipelines
David Lord [Sat, 20 Jul 2019 19:44:26 +0000 (12:44 -0700)] 
switch tests to azure pipelines

6 years agoMerge pull request #1025 from pallets/unpin-pytest
David Lord [Sat, 20 Jul 2019 19:22:17 +0000 (12:22 -0700)] 
Merge pull request #1025 from pallets/unpin-pytest

Unpin Pytest on master branch

6 years agostandardize license
David Lord [Wed, 17 Jul 2019 15:01:46 +0000 (08:01 -0700)] 
standardize license

6 years agoMerge pull request #1031 from minho42/Fix-typo
Joshua Bronson [Sun, 7 Jul 2019 15:36:01 +0000 (11:36 -0400)] 
Merge pull request #1031 from minho42/Fix-typo

Fix typo

6 years agoFix line length 1031/head
Min ho Kim [Sun, 7 Jul 2019 14:12:52 +0000 (00:12 +1000)] 
Fix line length

6 years agoApply suggestions
Min ho Kim [Sun, 7 Jul 2019 13:07:29 +0000 (23:07 +1000)] 
Apply suggestions

6 years agoFix typo
Min ho Kim [Sat, 6 Jul 2019 23:38:28 +0000 (09:38 +1000)] 
Fix typo

6 years agoMerge pull request #975 from kevbroch/master
Kevin Brown [Tue, 25 Jun 2019 00:37:30 +0000 (20:37 -0400)] 
Merge pull request #975 from kevbroch/master

add list filter to make example match output

6 years agoMerge pull request #1002 from eplata31/bugfix-template-parse-if-with-dict-subproperty
Kevin Brown [Tue, 25 Jun 2019 00:32:11 +0000 (20:32 -0400)] 
Merge pull request #1002 from eplata31/bugfix-template-parse-if-with-dict-subproperty

BUGFIX #930 - Template parse if with when referencing with dictionary…

6 years agoMerge pull request #1013 from mayuropensource/jinja-670-sort-multi-attr
Kevin Brown [Tue, 25 Jun 2019 00:19:36 +0000 (20:19 -0400)] 
Merge pull request #1013 from mayuropensource/jinja-670-sort-multi-attr

Add ability to specify multiple attributes in sort

6 years agoUnpin pytest in tox.ini 1025/head
Kevin Brown [Tue, 25 Jun 2019 00:07:01 +0000 (20:07 -0400)] 
Unpin pytest in tox.ini

This was "temporarily" pinned many months back, given that this is not pinned on the stable branch and tests appear to be passing, we should be able to remove it here.

6 years agoMerge pull request #1021 from jdufresne/the-the
Joshua Bronson [Fri, 21 Jun 2019 23:47:51 +0000 (19:47 -0400)] 
Merge pull request #1021 from jdufresne/the-the

Fix typo "the the"

6 years agoFix typo "the the" 1021/head
Jon Dufresne [Fri, 21 Jun 2019 18:24:08 +0000 (11:24 -0700)] 
Fix typo "the the"

6 years agoMerge pull request #1019 from jbarreneche/backport-python3.7-collections-warning-fix
David Lord [Tue, 18 Jun 2019 15:22:01 +0000 (08:22 -0700)] 
Merge pull request #1019 from jbarreneche/backport-python3.7-collections-warning-fix

Backport python3.7 collections warning fix

6 years agoAdd python 3.7 deprecation warning fix to changelog 1019/head
Juan Barreneche [Tue, 18 Jun 2019 13:51:55 +0000 (10:51 -0300)] 
Add python 3.7 deprecation warning fix to changelog

6 years agoImport abstract base classes from collections.abc
Florian Bruhin [Wed, 27 Jun 2018 13:30:54 +0000 (15:30 +0200)] 
Import abstract base classes from collections.abc

In Python 3.7, importing ABCs directly from the `collections` module shows a
warning (and in Python 3.8 it will stop working) - see
https://github.com/python/cpython/commit/c66f9f8d3909f588c251957d499599a1680e2320

This fixes various DeprecationWarnings such as those:

```
.../jinja2/utils.py:485: DeprecationWarning: Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated, and in 3.8 it will stop working
  from collections import MutableMapping

.../jinja2/runtime.py:318: DeprecationWarning: Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated, and in 3.8 it will stop working
  from collections import Mapping
```

6 years agoRefactor _prepare_attribute_parts() to use in both make_attrgetter() and make_multi_a... 1013/head
mayur-srivastava [Sun, 9 Jun 2019 13:35:29 +0000 (09:35 -0400)] 
Refactor _prepare_attribute_parts() to use in both make_attrgetter() and make_multi_attrgetter()

6 years agoMerge pull request #1009 from shamsimam/doc-python-methods
Joshua Bronson [Thu, 6 Jun 2019 03:25:47 +0000 (23:25 -0400)] 
Merge pull request #1009 from shamsimam/doc-python-methods

adds documentation on use of python methods in expressions

6 years agoMerge pull request #1012 from yongbozhang/issue-423
Joshua Bronson [Thu, 6 Jun 2019 03:17:55 +0000 (23:17 -0400)] 
Merge pull request #1012 from yongbozhang/issue-423

Remind not to put block in if statements in doc

6 years agoMerge pull request #1015 from jab/pr-1011
Joshua Bronson [Thu, 6 Jun 2019 03:12:50 +0000 (23:12 -0400)] 
Merge pull request #1015 from jab/pr-1011

Document nested extends and super.super().

6 years agoFix "duplicate object description of jinja2" warning 1015/head
jab [Thu, 6 Jun 2019 03:04:36 +0000 (03:04 +0000)] 
Fix "duplicate object description of jinja2" warning

Follow suggestion to use :noindex: for the instance in api."

6 years agoImprove nested extends (super.super) example.
jab [Thu, 6 Jun 2019 02:34:01 +0000 (02:34 +0000)] 
Improve nested extends (super.super) example.

6 years agoWrite a new documentation section on nesting extends.
Scott Crosby [Fri, 31 May 2019 19:31:10 +0000 (14:31 -0500)] 
Write a new documentation section on nesting extends.

6 years agoissue-423 remind not to put block in if statements in doc 1012/head
yongbozhang [Fri, 31 May 2019 20:37:27 +0000 (16:37 -0400)] 
issue-423 remind not to put block in if statements in doc

6 years agoMerge pull request #1010 from dvamin/master
David Lord [Fri, 31 May 2019 21:01:21 +0000 (17:01 -0400)] 
Merge pull request #1010 from dvamin/master

docs: Python3-ize the examples

6 years agoAdd ability to specify multiple attributes in sort,
mayur-srivastava [Fri, 31 May 2019 20:50:15 +0000 (16:50 -0400)] 
Add ability to specify multiple attributes in sort,
e.g. foo|sort(attribute='name,id').

This fixes #670

6 years agodocs: Python3-ize the examples 1010/head
Deepak Amin [Fri, 31 May 2019 18:17:35 +0000 (14:17 -0400)] 
docs: Python3-ize the examples

This commit updates the examples to conform to Python 3 instead
of Python 2, as Python 3 is more acceptable these days.

6 years agoadds documentation on use of python methods in expressions 1009/head
Shams Imam [Fri, 31 May 2019 19:11:28 +0000 (14:11 -0500)] 
adds documentation on use of python methods in expressions

6 years agoMerge pull request #1008 from gokcegrbl/GH-999
David Lord [Fri, 31 May 2019 17:15:03 +0000 (13:15 -0400)] 
Merge pull request #1008 from gokcegrbl/GH-999

Added new method itervalues() to LRUCache and deprecated itervalue()

6 years agoAdded new method itervalues() to LRUCache and deprecated itervalue() 1008/head
gokcegrbl [Fri, 31 May 2019 12:28:44 +0000 (12:28 +0000)] 
Added new method itervalues() to LRUCache and deprecated itervalue()

(Fixes pallets/jinja#999)

6 years agoMerge pull request #1004 from myii/patch-1
David Lord [Tue, 21 May 2019 14:50:07 +0000 (07:50 -0700)] 
Merge pull request #1004 from myii/patch-1

docs(filters): fix typo `columwrapper` => `columnwrapper`

6 years agodocs(filters): fix typo `columwrapper` => `columnwrapper` 1004/head
Imran Iqbal [Mon, 20 May 2019 12:19:08 +0000 (13:19 +0100)] 
docs(filters): fix typo `columwrapper` => `columnwrapper`

6 years agoMerge pull request #1003 from flexferrum/master
David Lord [Fri, 17 May 2019 13:33:37 +0000 (06:33 -0700)] 
Merge pull request #1003 from flexferrum/master

Remove duplicated testcase

6 years agoRemove duplicated testcase 1003/head
Flex Ferrum [Thu, 16 May 2019 10:54:05 +0000 (13:54 +0300)] 
Remove duplicated testcase

6 years agoBUGFIX #930 - Template parse if with when referencing with dictionary subproperty 1002/head
eplata31 [Mon, 13 May 2019 20:46:41 +0000 (15:46 -0500)] 
BUGFIX #930 - Template parse if with when referencing with dictionary subproperty

6 years agoMerge pull request #988 from tbnorth/triv_docs_link
Kevin Brown [Sat, 11 May 2019 21:43:03 +0000 (17:43 -0400)] 
Merge pull request #988 from tbnorth/triv_docs_link

fixes #242, deletes link to Jinja 1 docs.

6 years agoAdd ChainableUndefined allowing getattr & getitem (#997)
Étienne Pelletier [Wed, 8 May 2019 14:47:33 +0000 (10:47 -0400)] 
Add ChainableUndefined allowing getattr & getitem (#997)

* Add ChainableUndefined allowing getattr & getitem

Allows using default values with chains of items or attributes that may
contain undefined values without raising a jinja2.exceptions.UndefinedError.

>>> import jinja2
>>> env = jinja2.Environment(undefined=jinja2.ChainableUndefined)
>>> env.from_string("{{ foo.bar['baz'] | default('val') }}").render()
'val'

* Remove class decorator from ChainableUndefined

6 years agoAdd new maintenance branch format to Travis (#987)
Kevin Brown [Tue, 7 May 2019 14:38:32 +0000 (10:38 -0400)] 
Add new maintenance branch format to Travis (#987)

* Added new maintenance branch format to Travis

The maintenance branch format appeared to change from
`[version]-maintenance` to `[version].x` in the recent months, and
this broke Travis CI builds made to those branches. Because they
no longer meet the branch regex, the pull requests builds against
these branches were no longer being run.

This ads the regex for any branch which ends in `.x`, which should
catch the new pattern for maintenance branches.

* Use the branch regex from werkzeug

This is more specific to only catch version number branches.

* Sync with master

Apparently the build configuration for this branch is very old and doesn't match master at all.

6 years agoMerge pull request #989 from LindsayYoung/patch-1
David Lord [Mon, 6 May 2019 19:41:36 +0000 (15:41 -0400)] 
Merge pull request #989 from LindsayYoung/patch-1

Create CODE_OF_CONDUCT.md