Commit graph

3885 commits

Author SHA1 Message Date
David Lord
f2a8087cf5 deprecate passing script_info to factory 2020-04-07 15:54:36 -07:00
David Lord
46f2aa7821 update docs requirements
remove duplicate docs
2020-04-07 14:39:18 -07:00
David Lord
f7130ab553 Merge pull request #3562 from pallets/remove-simplejson
Remove simplejson and deprecate encoding options
2020-04-07 13:40:39 -07:00
David Lord
23fb6f8065 update json docs 2020-04-07 13:37:14 -07:00
David Lord
1039d7834b deprecate JSON encoding options
make consistent with built-in json module
2020-04-07 12:32:27 -07:00
David Lord
187cfe90b8 remove simplejson
- remove encoding detection backport, json.loads supports it directly
- use str.translate instead of multiple str.replace
2020-04-07 09:55:39 -07:00
David Lord
9594326577 move package metadata to setup.cfg 2020-04-04 14:50:21 -07:00
David Lord
1de5873d66 remove unused ref directives
replace page refs with doc directives
2020-04-04 12:57:14 -07:00
David Lord
296ef35943 remove unused module docstrings 2020-04-04 12:28:08 -07:00
David Lord
7240d6c856 Merge pull request #3554 from pallets/drop-python2
Drop Python 2
2020-04-04 12:13:35 -07:00
David Lord
f5038c4c39 f-strings everywhere 2020-04-04 12:10:00 -07:00
David Lord
67bb43b738 apply pyupgrade 2020-04-04 12:10:00 -07:00
David Lord
1e5e3aae8a remove more compat code 2020-04-04 12:10:00 -07:00
David Lord
24723fa6e8 remove _compat module 2020-04-04 12:10:00 -07:00
David Lord
8cf6480f91 remove deprecated code 2020-04-04 12:10:00 -07:00
David Lord
8433de53c9 drop support for Python 2.7 and 3.5 2020-04-04 12:09:55 -07:00
David Lord
c0c76bd651 remove Python 2 from docs 2020-04-04 12:05:44 -07:00
David Lord
793bff721a Merge branch '1.1.x' 2020-04-03 10:25:51 -07:00
David Lord
dbdc26f2dc release version 1.1.2 2020-04-03 10:10:38 -07:00
David Lord
39d2597028 update deprecation versions 2020-04-03 10:02:40 -07:00
David Lord
e16df2b22f Merge pull request #3541 from jeenuv/clarify-static
Clarify that static_folder must be a relative path
2020-04-03 07:33:20 -07:00
Jeenu Viswambharan
7ddc55a3b3 clarify static_folder is relative to root_path 2020-04-03 07:28:44 -07:00
David Lord
6c1e73042f Merge pull request #3529 from pgkrit/master
Move HTML escaping example back to Variable Rules.
2020-04-02 12:55:49 -07:00
David Lord
4e98cf6511 move html escaping to dedicated section 2020-04-02 12:49:00 -07:00
David Lord
b3b56f0c0c update CLI docs IDE integration 2020-04-02 12:09:04 -07:00
David Lord
f6325085ae Merge remote-tracking branch 'origin/1.1.x' 2020-04-02 11:56:30 -07:00
David Lord
5491a19ffc Merge pull request #3530 from valleygtc/docs-fix
docs: testing.rst function def missing colon
2020-04-02 11:55:01 -07:00
David Lord
0a94c998d7 Merge pull request #3537 from shanavas786/master
Update deprecated for config.from_json
2020-04-02 11:54:25 -07:00
Joshua Bronson
fae63cea2c Merge pull request #3544 from mattc41190/patch-2
Grammar and clarity fix
2020-03-25 10:39:45 -04:00
mattc41190
275216f607 Grammar and clarity fix 2020-03-25 09:20:55 -05:00
Joshua Bronson
3b17017949 Merge pull request #3543 from mattc41190/patch-1
itty bitty typo
2020-03-24 11:17:25 -04:00
mattc41190
88a07f1b75 itty bitty typo 2020-03-24 09:54:32 -05:00
Shanavas M
e647a4a07a Update deprecated for config.from_json 2020-03-18 12:37:51 +05:30
David Lord
d0c0d5bc3f Merge pull request #3536 from gnumoksha/patch-2
docs: update "Deploying on Google App Engine"
2020-03-16 15:26:49 -07:00
Tobias Sette
4a5f5fc0a2 docs: update "Deploying on Google App Engine"
Use the documentation for Python 3 instead of Python 2, which is deprecated.
2020-03-16 19:18:53 -03:00
David Lord
3cbf71ac8a Merge pull request #3524 from jeffwidman/patch-2
Remove deprecated `license_file` option
2020-03-11 07:40:06 -07:00
David Lord
449a32536c Merge pull request #3513 from kevinanew/master
Make code more easy to read
2020-03-11 07:31:20 -07:00
kevinanew
243c08238b refactor variable choices into if blocks 2020-03-11 07:24:38 -07:00
gutianci
1859a5fd2c docs: testing.rst function def missing colon 2020-03-05 18:31:21 +08:00
Peter G Kritikos
58c9794260 Move HTML escaping example back to Variable Rules.
Demonstration of markupsafe's escape function was in the Minimal
Application example, but the minimal example does not accept user
input.
2020-03-04 18:50:36 -05:00
Jeff Widman
c96d163421 Remove deprecated license_file option
Starting with wheel 0.32.0 (2018-09-29), the `license_file` option is
deprecated in favor of `license_files`.

https://wheel.readthedocs.io/en/stable/news.html

The wheel will continue to include `LICENSE`, it is now included
automatically:

https://wheel.readthedocs.io/en/stable/user_guide.html#including-license-files-in-the-generated-wheel-file

See https://github.com/FactoryBoy/factory_boy/pull/696 for inspiration and more discussion.
2020-03-02 10:21:15 -08:00
David Lord
74678dc1e5 Merge pull request #3521 from ongopongo/patch-1
Fix property name in description
2020-02-28 12:18:04 -08:00
ongopongo
1952236085 Fix property name in description
Previously, the description referred to a property named `original_error`.
However, both the code sample that followed it _and_ the Werkzeug
documentation refer to it as `original_exception` instead.

In this commit, I change the description to use the same property name
as is used in the code sample and the Werkzeug documentation.

Here's a link to the Werkzeug documentation of that property:
- https://werkzeug.palletsprojects.com/en/1.0.x/exceptions/#werkzeug.exceptions.InternalServerError.original_exception
2020-02-28 12:09:51 -08:00
kylepollina
e5477a099a Fix typo in docs (#3517) 2020-02-27 23:22:03 +01:00
David Lord
376a64137c Merge remote-tracking branch 'origin/1.1.x' 2020-02-15 10:40:32 -08:00
David Lord
ecb00c777f Merge pull request #3456 from frostming/bugfix/3452
Fix a bug that the static endpoint will unexpectedly catch all
2020-02-12 07:09:32 -08:00
Frost Ming
fe392e7884 Handle different sep across os 2020-02-12 13:17:03 +08:00
David Lord
9e0fe3efb0 Merge remote-tracking branch 'origin/1.1.x' 2020-02-10 18:41:07 -08:00
David Lord
202058e14a Merge pull request #3460 from yingshaoxo/patch-1
static_folder and static_url_path can be different
2020-02-10 18:40:25 -08:00
yingshaoxo
089a379b97 pass static_url_path along with static_folder 2020-02-10 18:33:32 -08:00