-
Notifications
You must be signed in to change notification settings - Fork 58
/
diff.txt
7972 lines (7427 loc) · 284 KB
/
diff.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/.devcontainer/on-create-command.sh b/.devcontainer/on-create-command.sh
index deffa37b..fdf77952 100755
--- a/.devcontainer/on-create-command.sh
+++ b/.devcontainer/on-create-command.sh
@@ -3,7 +3,7 @@ set -e
python3 -m venv .venv
. .venv/bin/activate
-pip install -U pip setuptools wheel
+pip install -U pip
pip install -r requirements/dev.txt
pip install -e .
pre-commit install --install-hooks
diff --git a/.flake8 b/.flake8
deleted file mode 100644
index 8f3b4fd4..00000000
--- a/.flake8
+++ /dev/null
@@ -1,25 +0,0 @@
-[flake8]
-extend-select =
- # bugbear
- B
- # bugbear opinions
- B9
- # implicit str concat
- ISC
-extend-ignore =
- # slice notation whitespace, invalid
- E203
- # line length, handled by bugbear B950
- E501
- # bare except, handled by bugbear B001
- E722
- # zip with strict=, requires python >= 3.10
- B905
- # string formatting opinion, B028 renamed to B907
- B028
- B907
-# up to 88 allowed by bugbear B950
-max-line-length = 80
-per-file-ignores =
- # __init__ exports names
- src/flask/__init__.py: F401
diff --git a/.github/workflows/lock.yaml b/.github/workflows/lock.yaml
index c790fae5..e19cdb71 100644
--- a/.github/workflows/lock.yaml
+++ b/.github/workflows/lock.yaml
@@ -3,23 +3,19 @@ name: 'Lock threads'
# two weeks. This does not close open issues, only humans may do that.
# We find that it is easier to respond to new issues with fresh examples
# rather than continuing discussions on old issues.
-
on:
schedule:
- cron: '0 0 * * *'
-
permissions:
issues: write
pull-requests: write
-
concurrency:
group: lock
-
jobs:
lock:
runs-on: ubuntu-latest
steps:
- - uses: dessant/lock-threads@c1b35aecc5cdb1a34539d14196df55838bb2f836
+ - uses: dessant/lock-threads@7de207be1d3ce97a9abe6ff1306222982d1ca9f9
with:
issue-inactive-days: 14
pr-inactive-days: 14
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 45a9c51b..a6ae6e42 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -9,12 +9,12 @@ jobs:
outputs:
hash: ${{ steps.hash.outputs.hash }}
steps:
- - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
- - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435
+ - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+ - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c
with:
python-version: '3.x'
- cache: 'pip'
- cache-dependency-path: 'requirements/*.txt'
+ cache: pip
+ cache-dependency-path: requirements*/*.txt
- run: pip install -r requirements/build.txt
# Use the commit date instead of the current date during the build.
- run: echo "SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)" >> $GITHUB_ENV
@@ -23,23 +23,24 @@ jobs:
- name: generate hash
id: hash
run: cd dist && echo "hash=$(sha256sum * | base64 -w0)" >> $GITHUB_OUTPUT
- - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce
+ - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
with:
+ name: dist
path: ./dist
provenance:
- needs: ['build']
+ needs: [build]
permissions:
actions: read
id-token: write
contents: write
# Can't pin with hash due to how this workflow works.
- uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v1.5.0
+ uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v1.9.0
with:
base64-subjects: ${{ needs.build.outputs.hash }}
create-release:
# Upload the sdist, wheels, and provenance to a GitHub release. They remain
# available as build artifacts for a while as well.
- needs: ['provenance']
+ needs: [provenance]
runs-on: ubuntu-latest
permissions:
contents: write
@@ -49,24 +50,20 @@ jobs:
run: >
gh release create --draft --repo ${{ github.repository }}
${{ github.ref_name }}
- *.intoto.jsonl/* artifact/*
+ *.intoto.jsonl/* dist/*
env:
GH_TOKEN: ${{ github.token }}
publish-pypi:
- needs: ['provenance']
+ needs: [provenance]
# Wait for approval before attempting to upload to PyPI. This allows reviewing the
# files in the draft release.
- environment: 'publish'
+ environment: publish
runs-on: ubuntu-latest
permissions:
id-token: write
steps:
- uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a
- # Try uploading to Test PyPI first, in case something fails.
- - uses: pypa/gh-action-pypi-publish@29930c9cf57955dc1b98162d0d8bc3ec80d9e75c
+ - uses: pypa/gh-action-pypi-publish@f946db0f765b9ae754e44bfd5ae5b8b91cfb37ef
with:
- repository_url: https://test.pypi.org/legacy/
- packages_dir: artifact/
- - uses: pypa/gh-action-pypi-publish@29930c9cf57955dc1b98162d0d8bc3ec80d9e75c
- with:
- packages_dir: artifact/
+ repository-url: https://test.pypi.org/legacy/
+ - uses: pypa/gh-action-pypi-publish@f946db0f765b9ae754e44bfd5ae5b8b91cfb37ef
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 79c382fe..b47ea3b3 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -9,9 +9,6 @@ on:
- '*.md'
- '*.rst'
pull_request:
- branches:
- - main
- - '*.x'
paths-ignore:
- 'docs/**'
- '*.md'
@@ -24,31 +21,26 @@ jobs:
fail-fast: false
matrix:
include:
- - {name: Linux, python: '3.11', os: ubuntu-latest, tox: py311}
- - {name: Windows, python: '3.11', os: windows-latest, tox: py311}
- - {name: Mac, python: '3.11', os: macos-latest, tox: py311}
- - {name: '3.12-dev', python: '3.12-dev', os: ubuntu-latest, tox: py312}
+ - {name: Linux, python: '3.12', os: ubuntu-latest, tox: py312}
+ - {name: Windows, python: '3.12', os: windows-latest, tox: py312}
+ - {name: Mac, python: '3.12', os: macos-latest, tox: py312}
+ - {name: '3.11', python: '3.11', os: ubuntu-latest, tox: py311}
- {name: '3.10', python: '3.10', os: ubuntu-latest, tox: py310}
- {name: '3.9', python: '3.9', os: ubuntu-latest, tox: py39}
- {name: '3.8', python: '3.8', os: ubuntu-latest, tox: py38}
- - {name: 'PyPy', python: 'pypy-3.9', os: ubuntu-latest, tox: pypy39}
- - {name: 'Minimum Versions', python: '3.11', os: ubuntu-latest, tox: py311-min}
+ - {name: 'PyPy', python: 'pypy-3.10', os: ubuntu-latest, tox: pypy310}
+ - {name: 'Minimum Versions', python: '3.12', os: ubuntu-latest, tox: py312-min}
- {name: 'Development Versions', python: '3.8', os: ubuntu-latest, tox: py38-dev}
- - {name: Typing, python: '3.11', os: ubuntu-latest, tox: typing}
+ - {name: Typing, python: '3.12', os: ubuntu-latest, tox: typing}
steps:
- - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
- - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435
+ - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+ - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c
with:
python-version: ${{ matrix.python }}
cache: 'pip'
- cache-dependency-path: 'requirements/*.txt'
- - name: update pip
- run: |
- pip install -U wheel
- pip install -U setuptools
- python -m pip install -U pip
+ cache-dependency-path: requirements*/*.txt
- name: cache mypy
- uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
+ uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2
with:
path: ./.mypy_cache
key: mypy|${{ matrix.python }}|${{ hashFiles('pyproject.toml') }}
diff --git a/.gitignore b/.gitignore
index e6713351..83aa92e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,25 +1,10 @@
-.DS_Store
-.env
-.flaskenv
-*.pyc
-*.pyo
-env/
-venv/
-.venv/
-env*
-dist/
-build/
-*.egg
-*.egg-info/
-.tox/
-.cache/
-.pytest_cache/
.idea/
-docs/_build/
-.vscode
-
-# Coverage reports
-htmlcov/
+.vscode/
+__pycache__/
+.tox/
.coverage
.coverage.*
-*,cover
+htmlcov/
+docs/_build/
+dist/
+venv/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 79b632ae..81e76c2e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,37 +1,16 @@
ci:
- autoupdate_branch: "2.2.x"
autoupdate_schedule: monthly
repos:
- - repo: https://github.com/asottile/pyupgrade
- rev: v3.3.2
+ - repo: https://github.com/astral-sh/ruff-pre-commit
+ rev: v0.1.13
hooks:
- - id: pyupgrade
- args: ["--py38-plus"]
- - repo: https://github.com/asottile/reorder_python_imports
- rev: v3.9.0
- hooks:
- - id: reorder-python-imports
- name: Reorder Python imports (src, tests)
- files: "^(?!examples/)"
- args: ["--application-directories", "src"]
- - repo: https://github.com/psf/black
- rev: 23.3.0
- hooks:
- - id: black
- - repo: https://github.com/PyCQA/flake8
- rev: 6.0.0
- hooks:
- - id: flake8
- additional_dependencies:
- - flake8-bugbear
- - flake8-implicit-str-concat
- - repo: https://github.com/peterdemin/pip-compile-multi
- rev: v2.6.2
- hooks:
- - id: pip-compile-multi-verify
+ - id: ruff
+ - id: ruff-format
- repo: https://github.com/pre-commit/pre-commit-hooks
- rev: v4.4.0
+ rev: v4.5.0
hooks:
+ - id: check-merge-conflict
+ - id: debug-statements
- id: fix-byte-order-marker
- id: trailing-whitespace
- id: end-of-file-fixer
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 346900b2..5ffe32b3 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -1,8 +1,8 @@
version: 2
build:
- os: ubuntu-20.04
+ os: ubuntu-22.04
tools:
- python: "3.10"
+ python: "3.12"
python:
install:
- requirements: requirements/docs.txt
diff --git a/CHANGES.rst b/CHANGES.rst
index 1ba0f341..37c54f97 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,7 +1,55 @@
+Version 3.0.2
+-------------
+
+Released 2024-02-03
+
+- Correct type for ``jinja_loader`` property. :issue:`5388`
+- Fix error with ``--extra-files`` and ``--exclude-patterns`` CLI options.
+ :issue:`5391`
+
+
+Version 3.0.1
+-------------
+
+Released 2024-01-18
+
+- Correct type for ``path`` argument to ``send_file``. :issue:`5230`
+- Fix a typo in an error message for the ``flask run --key`` option. :pr:`5344`
+- Session data is untagged without relying on the built-in ``json.loads``
+ ``object_hook``. This allows other JSON providers that don't implement that.
+ :issue:`5381`
+- Address more type findings when using mypy strict mode. :pr:`5383`
+
+
+Version 3.0.0
+-------------
+
+Released 2023-09-30
+
+- Remove previously deprecated code. :pr:`5223`
+- Deprecate the ``__version__`` attribute. Use feature detection, or
+ ``importlib.metadata.version("flask")``, instead. :issue:`5230`
+- Restructure the code such that the Flask (app) and Blueprint
+ classes have Sans-IO bases. :pr:`5127`
+- Allow self as an argument to url_for. :pr:`5264`
+- Require Werkzeug >= 3.0.0.
+
+
+Version 2.3.3
+-------------
+
+Released 2023-08-21
+
+- Python 3.12 compatibility.
+- Require Werkzeug >= 2.3.7.
+- Use ``flit_core`` instead of ``setuptools`` as build backend.
+- Refactor how an app's root and instance paths are determined. :issue:`5160`
+
+
Version 2.3.2
-------------
-Released 2022-05-01
+Released 2023-05-01
- Set ``Vary: Cookie`` header when the session is accessed, modified, or refreshed.
- Update Werkzeug requirement to >=2.3.3 to apply recent bug fixes.
@@ -69,6 +117,15 @@ Released 2023-04-25
- Use postponed evaluation of annotations. :pr:`5071`
+Version 2.2.5
+-------------
+
+Released 2023-05-02
+
+- Update for compatibility with Werkzeug 2.3.3.
+- Set ``Vary: Cookie`` header when the session is accessed, modified, or refreshed.
+
+
Version 2.2.4
-------------
@@ -289,7 +346,7 @@ Released 2022-03-28
or ``AppContext.g`` instead. :issue:`3898`
- ``copy_current_request_context`` can decorate async functions.
:pr:`4303`
-- The CLI uses ``importlib.metadata`` instead of ``setuptools`` to
+- The CLI uses ``importlib.metadata`` instead of ``pkg_resources`` to
load command entry points. :issue:`4419`
- Overriding ``FlaskClient.open`` will not cause an error on redirect.
:issue:`3396`
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 24daa729..fed44978 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -127,7 +127,7 @@ First time setup in your local environment
.. code-block:: text
- $ python -m pip install -U pip setuptools wheel
+ $ python -m pip install -U pip
$ pip install -r requirements/dev.txt && pip install -e .
- Install the pre-commit hooks.
diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index 65a97749..00000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1,11 +0,0 @@
-include CHANGES.rst
-include CONTRIBUTING.rst
-include tox.ini
-include requirements/*.txt
-graft artwork
-graft docs
-prune docs/_build
-graft examples
-graft tests
-include src/flask/py.typed
-global-exclude *.pyc
diff --git a/docs/api.rst b/docs/api.rst
index 043beb07..1aa8048f 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -519,11 +519,6 @@ Signals are provided by the `Blinker`_ library. See :doc:`signals` for an introd
.. versionadded:: 0.10
-.. data:: signals.signals_available
-
- .. deprecated:: 2.3
- Will be removed in Flask 2.4. Signals are always available
-
Class-Based Views
-----------------
diff --git a/docs/config.rst b/docs/config.rst
index 3c06b29c..7828fb92 100644
--- a/docs/config.rst
+++ b/docs/config.rst
@@ -410,8 +410,8 @@ from a TOML file:
.. code-block:: python
- import toml
- app.config.from_file("config.toml", load=toml.load)
+ import tomllib
+ app.config.from_file("config.toml", load=tomllib.load, text=False)
Or from a JSON file:
diff --git a/docs/errorhandling.rst b/docs/errorhandling.rst
index c281055f..faca58c2 100644
--- a/docs/errorhandling.rst
+++ b/docs/errorhandling.rst
@@ -231,7 +231,7 @@ responses, you could also pass them through directly.
Error handlers still respect the exception class hierarchy. If you
register handlers for both ``HTTPException`` and ``Exception``, the
``Exception`` handler will not handle ``HTTPException`` subclasses
-because it the ``HTTPException`` handler is more specific.
+because the ``HTTPException`` handler is more specific.
Unhandled Exceptions
diff --git a/docs/patterns/appdispatch.rst b/docs/patterns/appdispatch.rst
index efa470a7..f22c8060 100644
--- a/docs/patterns/appdispatch.rst
+++ b/docs/patterns/appdispatch.rst
@@ -18,34 +18,20 @@ Working with this Document
--------------------------
Each of the techniques and examples below results in an ``application``
-object that can be run with any WSGI server. For production, see
-:doc:`/deploying/index`. For development, Werkzeug provides a server
-through :func:`werkzeug.serving.run_simple`::
+object that can be run with any WSGI server. For development, use the
+``flask run`` command to start a development server. For production, see
+:doc:`/deploying/index`.
- from werkzeug.serving import run_simple
- run_simple('localhost', 5000, application, use_reloader=True)
-
-Note that :func:`run_simple <werkzeug.serving.run_simple>` is not intended for
-use in production. Use a production WSGI server. See :doc:`/deploying/index`.
-
-In order to use the interactive debugger, debugging must be enabled both on
-the application and the simple server. Here is the "hello world" example with
-debugging and :func:`run_simple <werkzeug.serving.run_simple>`::
+.. code-block:: python
from flask import Flask
- from werkzeug.serving import run_simple
app = Flask(__name__)
- app.debug = True
@app.route('/')
def hello_world():
return 'Hello World!'
- if __name__ == '__main__':
- run_simple('localhost', 5000, app,
- use_reloader=True, use_debugger=True, use_evalex=True)
-
Combining Applications
----------------------
@@ -58,7 +44,9 @@ are combined by the dispatcher middleware into a larger one that is
dispatched based on prefix.
For example you could have your main application run on ``/`` and your
-backend interface on ``/backend``::
+backend interface on ``/backend``.
+
+.. code-block:: python
from werkzeug.middleware.dispatcher import DispatcherMiddleware
from frontend_app import application as frontend
@@ -89,7 +77,9 @@ the dynamic application creation.
The perfect level for abstraction in that regard is the WSGI layer. You
write your own WSGI application that looks at the request that comes and
delegates it to your Flask application. If that application does not
-exist yet, it is dynamically created and remembered::
+exist yet, it is dynamically created and remembered.
+
+.. code-block:: python
from threading import Lock
@@ -117,7 +107,9 @@ exist yet, it is dynamically created and remembered::
return app(environ, start_response)
-This dispatcher can then be used like this::
+This dispatcher can then be used like this:
+
+.. code-block:: python
from myapplication import create_app, get_user_for_subdomain
from werkzeug.exceptions import NotFound
@@ -143,10 +135,12 @@ Dispatch by Path
Dispatching by a path on the URL is very similar. Instead of looking at
the ``Host`` header to figure out the subdomain one simply looks at the
-request path up to the first slash::
+request path up to the first slash.
+
+.. code-block:: python
from threading import Lock
- from werkzeug.wsgi import pop_path_info, peek_path_info
+ from wsgiref.util import shift_path_info
class PathDispatcher:
@@ -166,15 +160,24 @@ request path up to the first slash::
return app
def __call__(self, environ, start_response):
- app = self.get_application(peek_path_info(environ))
+ app = self.get_application(_peek_path_info(environ))
if app is not None:
- pop_path_info(environ)
+ shift_path_info(environ)
else:
app = self.default_app
return app(environ, start_response)
+ def _peek_path_info(environ):
+ segments = environ.get("PATH_INFO", "").lstrip("/").split("/", 1)
+ if segments:
+ return segments[0]
+
+ return None
+
The big difference between this and the subdomain one is that this one
-falls back to another application if the creator function returns ``None``::
+falls back to another application if the creator function returns ``None``.
+
+.. code-block:: python
from myapplication import create_app, default_app, get_user_for_prefix
diff --git a/docs/patterns/javascript.rst b/docs/patterns/javascript.rst
index 4b1d7e0f..d58a3eb6 100644
--- a/docs/patterns/javascript.rst
+++ b/docs/patterns/javascript.rst
@@ -125,8 +125,8 @@ in a Flask view.
.. code-block:: javascript
let data = new FormData()
- data.append("name": "Flask Room")
- data.append("description": "Talk about Flask here.")
+ data.append("name", "Flask Room")
+ data.append("description", "Talk about Flask here.")
fetch(room_url, {
"method": "POST",
"body": data,
@@ -197,7 +197,7 @@ in the previous section. The following example shows how to replace a
const geology_div = getElementById("geology-fact")
fetch(geology_url)
.then(response => response.text)
- .then(text => geology_div.innerHtml = text)
+ .then(text => geology_div.innerHTML = text)
</script>
diff --git a/docs/patterns/packages.rst b/docs/patterns/packages.rst
index 239a3fa2..90fa8a8f 100644
--- a/docs/patterns/packages.rst
+++ b/docs/patterns/packages.rst
@@ -54,8 +54,8 @@ a big problem, just add a new file called :file:`pyproject.toml` next to the inn
]
[build-system]
- requires = ["setuptools"]
- build-backend = "setuptools.build_meta"
+ requires = ["flit_core<4"]
+ build-backend = "flit_core.buildapi"
Install your application so it is importable:
diff --git a/docs/patterns/sqlalchemy.rst b/docs/patterns/sqlalchemy.rst
index 734d550c..7e4108d0 100644
--- a/docs/patterns/sqlalchemy.rst
+++ b/docs/patterns/sqlalchemy.rst
@@ -34,8 +34,7 @@ official documentation on the `declarative`_ extension.
Here's the example :file:`database.py` module for your application::
from sqlalchemy import create_engine
- from sqlalchemy.orm import scoped_session, sessionmaker
- from sqlalchemy.ext.declarative import declarative_base
+ from sqlalchemy.orm import scoped_session, sessionmaker, declarative_base
engine = create_engine('sqlite:////tmp/test.db')
db_session = scoped_session(sessionmaker(autocommit=False,
diff --git a/docs/server.rst b/docs/server.rst
index d38aa120..11e976bc 100644
--- a/docs/server.rst
+++ b/docs/server.rst
@@ -76,8 +76,8 @@ following example shows that process id 6847 is using port 5000.
TCP 127.0.0.1:5000 0.0.0.0:0 LISTENING 6847
macOS Monterey and later automatically starts a service that uses port
-5000. To disable the service, go to System Preferences, Sharing, and
-disable "AirPlay Receiver".
+5000. You can choose to disable this service instead of using a different port by
+searching for "AirPlay Receiver" in System Preferences and toggling it off.
Deferred Errors on Reload
diff --git a/docs/tutorial/install.rst b/docs/tutorial/install.rst
index 9bb1234e..db83e106 100644
--- a/docs/tutorial/install.rst
+++ b/docs/tutorial/install.rst
@@ -35,35 +35,19 @@ The ``pyproject.toml`` file describes your project and how to build it.
[project]
name = "flaskr"
version = "1.0.0"
+ description = "The basic blog app built in the Flask tutorial."
dependencies = [
"flask",
]
[build-system]
- requires = ["setuptools"]
- build-backend = "setuptools.build_meta"
+ requires = ["flit_core<4"]
+ build-backend = "flit_core.buildapi"
-
-The setuptools build backend needs another file named ``MANIFEST.in`` to tell it about
-non-Python files to include.
-
-.. code-block:: none
- :caption: ``MANIFEST.in``
-
- include flaskr/schema.sql
- graft flaskr/static
- graft flaskr/templates
- global-exclude *.pyc
-
-This tells the build to copy everything in the ``static`` and ``templates`` directories,
-and the ``schema.sql`` file, but to exclude all bytecode files.
-
-See the official `Packaging tutorial <packaging tutorial_>`_ and
-`detailed guide <packaging guide_>`_ for more explanation of the files
-and options used.
+See the official `Packaging tutorial <packaging tutorial_>`_ for more
+explanation of the files and options used.
.. _packaging tutorial: https://packaging.python.org/tutorials/packaging-projects/
-.. _packaging guide: https://packaging.python.org/guides/distributing-packages-using-setuptools/
Install the Project
@@ -95,9 +79,7 @@ You can observe that the project is now installed with ``pip list``.
Jinja2 2.10
MarkupSafe 1.0
pip 9.0.3
- setuptools 39.0.1
Werkzeug 0.14.1
- wheel 0.30.0
Nothing changes from how you've been running your project so far.
``--app`` is still set to ``flaskr`` and ``flask run`` still runs
diff --git a/examples/celery/pyproject.toml b/examples/celery/pyproject.toml
index e480aebc..25887ca2 100644
--- a/examples/celery/pyproject.toml
+++ b/examples/celery/pyproject.toml
@@ -7,5 +7,11 @@ requires-python = ">=3.8"
dependencies = ["flask>=2.2.2", "celery[redis]>=5.2.7"]
[build-system]
-requires = ["setuptools"]
-build-backend = "setuptools.build_meta"
+requires = ["flit_core<4"]
+build-backend = "flit_core.buildapi"
+
+[tool.flit.module]
+name = "task_app"
+
+[tool.ruff]
+src = ["src"]
diff --git a/examples/celery/requirements.txt b/examples/celery/requirements.txt
index ce9ae72c..29075ab5 100644
--- a/examples/celery/requirements.txt
+++ b/examples/celery/requirements.txt
@@ -1,5 +1,5 @@
#
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --resolver=backtracking pyproject.toml
@@ -10,6 +10,8 @@ async-timeout==4.0.2
# via redis
billiard==3.6.4.0
# via celery
+blinker==1.6.2
+ # via flask
celery[redis]==5.2.7
# via flask-example-celery (pyproject.toml)
click==8.1.3
@@ -25,7 +27,7 @@ click-plugins==1.1.1
# via celery
click-repl==0.2.0
# via celery
-flask==2.2.3
+flask==2.3.2
# via flask-example-celery (pyproject.toml)
itsdangerous==2.1.2
# via flask
@@ -37,11 +39,11 @@ markupsafe==2.1.2
# via
# jinja2
# werkzeug
-prompt-toolkit==3.0.37
+prompt-toolkit==3.0.38
# via click-repl
-pytz==2022.7.1
+pytz==2023.3
# via celery
-redis==4.5.1
+redis==4.5.4
# via celery
six==1.16.0
# via click-repl
@@ -52,5 +54,5 @@ vine==5.0.0
# kombu
wcwidth==0.2.6
# via prompt-toolkit
-werkzeug==2.2.3
+werkzeug==2.3.3
# via flask
diff --git a/examples/javascript/MANIFEST.in b/examples/javascript/MANIFEST.in
deleted file mode 100644
index c730a34e..00000000
--- a/examples/javascript/MANIFEST.in
+++ /dev/null
@@ -1,4 +0,0 @@
-include LICENSE.rst
-graft js_example/templates
-graft tests
-global-exclude *.pyc
diff --git a/examples/javascript/js_example/views.py b/examples/javascript/js_example/views.py
index 0d4b6561..9f0d26c5 100644
--- a/examples/javascript/js_example/views.py
+++ b/examples/javascript/js_example/views.py
@@ -2,7 +2,7 @@ from flask import jsonify
from flask import render_template
from flask import request
-from js_example import app
+from . import app
@app.route("/", defaults={"js": "fetch"})
diff --git a/examples/javascript/pyproject.toml b/examples/javascript/pyproject.toml
index e74415b8..0ec631d2 100644
--- a/examples/javascript/pyproject.toml
+++ b/examples/javascript/pyproject.toml
@@ -3,7 +3,7 @@ name = "js_example"
version = "1.1.0"
description = "Demonstrates making AJAX requests to Flask."
readme = "README.rst"
-license = {text = "BSD-3-Clause"}
+license = {file = "LICENSE.rst"}
maintainers = [{name = "Pallets", email = "contact@palletsprojects.com"}]
dependencies = ["flask"]
@@ -14,8 +14,11 @@ Documentation = "https://flask.palletsprojects.com/patterns/jquery/"
test = ["pytest"]
[build-system]
-requires = ["setuptools"]
-build-backend = "setuptools.build_meta"
+requires = ["flit_core<4"]
+build-backend = "flit_core.buildapi"
+
+[tool.flit.module]
+name = "js_example"
[tool.pytest.ini_options]
testpaths = ["tests"]
@@ -24,3 +27,6 @@ filterwarnings = ["error"]
[tool.coverage.run]
branch = true
source = ["js_example", "tests"]
+
+[tool.ruff]
+src = ["src"]
diff --git a/examples/tutorial/MANIFEST.in b/examples/tutorial/MANIFEST.in
deleted file mode 100644
index 97d55d51..00000000
--- a/examples/tutorial/MANIFEST.in
+++ /dev/null
@@ -1,6 +0,0 @@
-include LICENSE.rst
-include flaskr/schema.sql
-graft flaskr/static
-graft flaskr/templates
-graft tests
-global-exclude *.pyc
diff --git a/examples/tutorial/flaskr/__init__.py b/examples/tutorial/flaskr/__init__.py
index bb9cce5a..e35934d6 100644
--- a/examples/tutorial/flaskr/__init__.py
+++ b/examples/tutorial/flaskr/__init__.py
@@ -31,12 +31,13 @@ def create_app(test_config=None):
return "Hello, World!"
# register the database commands
- from flaskr import db
+ from . import db
db.init_app(app)
# apply the blueprints to the app
- from flaskr import auth, blog
+ from . import auth
+ from . import blog
app.register_blueprint(auth.bp)
app.register_blueprint(blog.bp)
diff --git a/examples/tutorial/flaskr/auth.py b/examples/tutorial/flaskr/auth.py
index b423e6ae..34c03a20 100644
--- a/examples/tutorial/flaskr/auth.py
+++ b/examples/tutorial/flaskr/auth.py
@@ -11,7 +11,7 @@ from flask import url_for
from werkzeug.security import check_password_hash
from werkzeug.security import generate_password_hash
-from flaskr.db import get_db
+from .db import get_db
bp = Blueprint("auth", __name__, url_prefix="/auth")
diff --git a/examples/tutorial/flaskr/blog.py b/examples/tutorial/flaskr/blog.py
index 3704626b..be0d92c4 100644
--- a/examples/tutorial/flaskr/blog.py
+++ b/examples/tutorial/flaskr/blog.py
@@ -7,8 +7,8 @@ from flask import request
from flask import url_for
from werkzeug.exceptions import abort
-from flaskr.auth import login_required
-from flaskr.db import get_db
+from .auth import login_required
+from .db import get_db
bp = Blueprint("blog", __name__)
diff --git a/examples/tutorial/pyproject.toml b/examples/tutorial/pyproject.toml
index c86eb61f..73a674ce 100644
--- a/examples/tutorial/pyproject.toml
+++ b/examples/tutorial/pyproject.toml
@@ -16,8 +16,16 @@ Documentation = "https://flask.palletsprojects.com/tutorial/"
test = ["pytest"]
[build-system]
-requires = ["setuptools"]
-build-backend = "setuptools.build_meta"
+requires = ["flit_core<4"]
+build-backend = "flit_core.buildapi"
+
+[tool.flit.module]
+name = "flaskr"
+
+[tool.flit.sdist]
+include = [
+ "tests/",
+]
[tool.pytest.ini_options]
testpaths = ["tests"]
@@ -26,3 +34,6 @@ filterwarnings = ["error"]
[tool.coverage.run]
branch = true
source = ["flaskr", "tests"]
+
+[tool.ruff]
+src = ["src"]
diff --git a/pyproject.toml b/pyproject.toml
index 400ed59f..3fefae18 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,10 +1,10 @@
[project]
name = "Flask"
+version = "3.0.2"
description = "A simple framework for building complex web applications."
readme = "README.rst"
-license = {text = "BSD-3-Clause"}
+license = {file = "LICENSE.rst"}
maintainers = [{name = "Pallets", email = "contact@palletsprojects.com"}]
-authors = [{name = "Armin Ronacher", email = "armin.ronacher@active-4.com"}]
classifiers = [
"Development Status :: 5 - Production/Stable",
"Environment :: Web Environment",
@@ -20,14 +20,13 @@ classifiers = [
]
requires-python = ">=3.8"
dependencies = [
- "Werkzeug>=2.3.3",
+ "Werkzeug>=3.0.0",
"Jinja2>=3.1.2",
"itsdangerous>=2.1.2",
"click>=8.1.3",
"blinker>=1.6.2",
"importlib-metadata>=3.6.0; python_version < '3.10'",
]
-dynamic = ["version"]
[project.urls]
Donate = "https://palletsprojects.com/donate"
@@ -45,18 +44,30 @@ dotenv = ["python-dotenv"]
flask = "flask.cli:main"
[build-system]
-requires = ["setuptools"]
-build-backend = "setuptools.build_meta"
+requires = ["flit_core<4"]
+build-backend = "flit_core.buildapi"
-[tool.setuptools.dynamic]
-version = {attr = "flask.__version__"}
+[tool.flit.module]
+name = "flask"
+
+[tool.flit.sdist]
+include = [
+ "docs/",
+ "examples/",
+ "requirements/",
+ "tests/",
+ "CHANGES.rst",
+ "CONTRIBUTING.rst",
+ "tox.ini",
+]
+exclude = [
+ "docs/_build/",
+]
[tool.pytest.ini_options]
testpaths = ["tests"]
filterwarnings = [
"error",
- # change in Python 3.12 alpha causes warning from inside pytest
- "ignore:onerror argument:DeprecationWarning",
]
[tool.coverage.run]