8000 bpo-45442: Add deactivate step to venv tutorial. by ShivnarenSrinivasan · Pull Request #28959 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-45442: Add deactivate step to venv tutorial. #28959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 18 commits into from
Closed

bpo-45442: Add deactivate step to venv tutorial. #28959

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b057f99
bpo-45442: Add deactivate step to venv tutorial.
ShivnarenSrinivasan Oct 14, 2021
11150a4
bpo-45442: Fix indentation/syntax error
ShivnarenSrinivasan Oct 15, 2021
8813d6a
bpo-45442: Remove explanation of implementation detail.
ShivnarenSrinivasan Oct 15, 2021
dcff25a
bpo-45474: Fix the limited C API of marshal.h (GH-28956)
vstinner Oct 14, 2021
e64410b
bpo-45434: Limited Python.h no longer includes stdio.h (GH-28960)
vstinner Oct 14, 2021
46c18f2
bpo-41710: Fix What's New Entry credit (GH-28962)
vstinner Oct 14, 2021
5c8be2b
bpo-45434: Remove useless space in includes (GH-28963)
vstinner Oct 14, 2021
37e1a68
po-35134: Move Include/funcobject.h to Include/cpython/ (GH-28958)
vstinner Oct 14, 2021
96805ce
bpo-35134: Move Include/cellobject.h to Include/cpython/ (GH-28964)
vstinner Oct 15, 2021
6adbd0f
closes bpo-45479: Degunkify Py_UniversalNewlineFgets. (GH-28965)
benjaminp Oct 15, 2021
a119c0c
bpo-45479: Futher simplify Py_UniversalNewlineFgets. (GH-28967)
benjaminp Oct 15, 2021
c82f6be
bpo-35134: Move classobject.h to Include/cpython/ (GH-28968)
vstinner Oct 15, 2021
c50770d
bpo-45428: Fix reading filenames from stdin in py_compile (GH-28848)
ginggs Oct 15, 2021
d0d02d1
bpo-35081: Move interpreteridobject.h to Include/internal/ (GH-28969)
vstinner Oct 15, 2021
50818d2
bpo-45434: Remove Include/eval.h header file (GH-28973)
vstinner Oct 15, 2021
1856e8c
bpo-45445: Remove incorrectly commited test file (GH-28972)
pablogsal Oct 15, 2021
7dad45b
bpo-44113: Move the What's New entry to Deprecate section (GH-28974)
vstinner Oct 15, 2021
675ff5d
bpo-45482: Rename namespaceobject.h to pycore_namespace.h (GH-28975)
vstinner Oct 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
po-35134: Move Include/funcobject.h to Include/cpython/ (GH-28958) 
Remove redundant "#ifndef Py_LIMITED_API" in funcobject.h.
  • Loading branch information
@vstinner @ShivnarenSrinivasan
vstinner authored and ShivnarenSrinivasan committed Oct 15, 2021
commit 37e1a68c6595619929335c48005ee72814030fe9
6 changes: 6 additions & 0 deletions Doc/whatsnew/3.11.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,12 @@ Porting to Python 3.11
header provides functions like ``printf()`` and ``fopen()``.
(Contributed by Victor Stinner in :issue:`45434`.)

* The non-limited API file ``funcobject.h`` has been moved to the
``Include/cpython`` directory. This file must not be included directly, as it
is already included in ``Python.h``: :ref:`Include Files <api-includes>`. If
it has been included directly, consider including ``Python.h`` instead.
(Contributed by Victor Stinner in :issue:`35134`.)

Deprecated
----------

Expand Down
2 changes: 1 addition & 1 deletion Include/Python.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
#include "setobject.h"
#include "methodobject.h"
#include "moduleobject.h"
#include "funcobject.h"
#include "cpython/funcobject.h"
#include "classobject.h"
#include "fileobject.h"
#include "pycapsule.h"
Expand Down
4 changes: 1 addition & 3 deletions Include/funcobject.h → Include/cpython/funcobject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

/* Function object interface */

#ifndef Py_LIMITED_API
#ifndef Py_FUNCOBJECT_H
#define Py_FUNCOBJECT_H
Expand Down Expand Up @@ -76,15 +76,13 @@ PyAPI_FUNC(int) PyFunction_SetClosure(PyObject *, PyObject *);
PyAPI_FUNC(PyObject *) PyFunction_GetAnnotations(PyObject *);
PyAPI_FUNC(int) PyFunction_SetAnnotations(PyObject *, PyObject *);

#ifndef Py_LIMITED_API
PyAPI_FUNC(PyObject *) _PyFunction_Vectorcall(
PyObject *func,
PyObject *const *stack,
size_t nargsf,
PyObject *kwnames);

uint32_t _PyFunction_GetVersionForCurrentState(PyFunctionObject *func);
#endif

/* Macros for direct access to these values. Type checks are *not*
done, so use with care. */
Expand Down
2 changes: 1 addition & 1 deletion Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1145,7 +1145,6 @@ PYTHON_HEADERS= \
$(srcdir)/Include/fileutils.h \
$(srcdir)/Include/floatobject.h \
$(srcdir)/Include/frameobject.h \
$(srcdir)/Include/funcobject.h \
$(srcdir)/Include/genobject.h \
$(srcdir)/Include/import.h \
$(srcdir)/Include/interpreteridobject.h \
Expand Down Expand Up @@ -1210,6 +1209,7 @@ PYTHON_HEADERS= \
$(srcdir)/Include/cpython/fileutils.h \
$(srcdir)/Include/cpython/floatobject.h \
$(srcdir)/Include/cpython/frameobject.h \
$(srcdir)/Include/cpython/funcobject.h \
$(srcdir)/Include/cpython/import.h \
$(srcdir)/Include/cpython/initconfig.h \
$(srcdir)/Include/cpython/interpreteridobject.h \
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/C API/2021-10-15-00-11-51.bpo-35134.eX4zqy.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Move Include/funcobject.h header file to Include/cpython/funcobject.h.
C extensions should only include the main ``<Python.h>`` header.
Patch by Victor Stinner.
2 changes: 1 addition & 1 deletion PCbuild/pythoncore.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@
<ClInclude Include="..\Include\cpython\fileutils.h" />
<ClInclude Include="..\Include\cpython\floatobject.h" />
<ClInclude Include="..\Include\cpython\frameobject.h" />
<ClInclude Include="..\Include\cpython\funcobject.h" />
<ClInclude Include="..\Include\cpython\import.h" />
<ClInclude Include="..\Include\cpython\initconfig.h" />
<ClInclude Include="..\Include\cpython\interpreteridobject.h" />
Expand Down Expand Up @@ -169,7 +170,6 @@
<ClInclude Include="..\Include\fileutils.h" />
<ClInclude Include="..\Include\floatobject.h" />
<ClInclude Include="..\Include\frameobject.h" />
<ClInclude Include="..\Include\funcobject.h" />
<ClInclude Include="..\Include\genobject.h" />
<ClInclude Include="..\Include\import.h" />
<ClInclude Include="..\Include\internal\pycore_abstract.h" />
Expand Down
6 changes: 3 additions & 3 deletions PCbuild/pythoncore.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,6 @@
<ClInclude Include="..\Include\frameobject.h">
<Filter>Include</Filter>
</ClInclude>
<ClInclude Include="..\Include\funcobject.h">
<Filter>Include</Filter>
</ClInclude>
<ClInclude Include="..\Include\genobject.h">
<Filter>Include</Filter>
</ClInclude>
Expand Down Expand Up @@ -456,6 +453,9 @@
<ClInclude Include="..\Include\cpython\frameobject.h">
<Filter>Include\cpython</Filter>
</ClInclude>
<ClInclude Include="..\Include\cpython\funcobject.h">
<Filter>Include\cpython</Filter>
</ClInclude>
<ClInclude Include="..\Include\cpython\interpreteridobject.h">
<Filter>Include\cpython</Filter>
</ClInclude>
Expand Down
1 change: 0 additions & 1 deletion Tools/scripts/stable_abi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
"datetime.h",
"dtoa.h",
"frameobject.h",
"funcobject.h",
"genobject.h",
"longintrepr.h",
"parsetok.h",
Expand Down
0