Skip to content

Commit 6c3dca7

Browse files
fabiozint19h
fabioz
authored and
int19h
committed
Update pydevd to 2.9.5 (available with Apache lic now).
1 parent c419d5a commit 6c3dca7

File tree

9 files changed

+257
-168
lines changed

9 files changed

+257
-168
lines changed

‎src/debugpy/_vendored/pydevd/LICENSE-APACHE

Lines changed: 176 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,176 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS

‎src/debugpy/_vendored/pydevd/LICENSE renamed to ‎src/debugpy/_vendored/pydevd/LICENSE-EPL

File renamed without changes.

‎src/debugpy/_vendored/pydevd/MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include *.rst *.txt *.md LICENSE *.pyx *.cpp *.hpp
1+
include *.rst *.txt *.md LICENSE-EPL LICENSE-APACHE *.pyx *.cpp *.hpp
22
recursive-include pydevd_attach_to_process *.py *.dll *.so *.dylib *.txt *.c *.h *.bat Makefile *.sh *.pyx *.cpp *.hpp
33
recursive-include pydevd_attach_to_process/common *.py *.dll *.so *.dylib *.txt *.c *.h *.bat Makefile *.sh *.pyx *.cpp *.hpp
44
recursive-include pydevd_attach_to_process/linux_and_mac *.py *.dll *.so *.dylib *.txt *.c *.h *.bat Makefile *.sh *.pyx *.cpp *.hpp

‎src/debugpy/_vendored/pydevd/README.rst renamed to ‎src/debugpy/_vendored/pydevd/README.md

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,3 @@ For `Python 2` please keep using `pydevd 2.8.0`.
2323
Recent versions contain speedup modules using Cython, which are generated with a few changes in the regular files
2424
to `cythonize` the files. To update and compile the cython sources (and generate some other auto-generated files),
2525
`build_tools/build.py` should be run -- note that the resulting .pyx and .c files should be commited.
26-
27-
To generate a distribution with the precompiled binaries for the IDE, `build_binaries_windows.py` should be run (
28-
note that the environments must be pre-created as specified in that file).
29-
30-
To generate a distribution to upload to PyPi, `python setup.py sdist bdist_wheel` should be run for each python version
31-
which should have a wheel and afterwards `twine upload -s dist/pydevd-*` should be run to actually upload the contents
32-
to PyPi.
33-
34-
GitHub Actions (CI):
35-
36-
.. |github_actions| https://github.com/fabioz/PyDev.Debugger/workflows/PyDev.Debugger Tests/badge.svg
37-
:target: https://github.com/fabioz/PyDev.Debugger/workflows/PyDev.Debugger Tests/badge.svg
38-
39-
|github_actions|
40-

‎src/debugpy/_vendored/pydevd/build_tools/build.py

Lines changed: 31 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -103,42 +103,39 @@ def build():
103103
# set DISTUTILS_USE_SDK=1
104104
# set VS100COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\Tools
105105

106-
env = os.environ.copy()
107-
if sys.version_info[:2] in ((2, 6), (2, 7), (3, 5), (3, 6), (3, 7), (3, 8), (3, 9), (3, 10), (3, 11)):
108-
import setuptools # We have to import it first for the compiler to be found
109-
from distutils import msvc9compiler
110-
111-
if sys.version_info[:2] in ((2, 6), (2, 7)):
112-
vcvarsall = msvc9compiler.find_vcvarsall(9.0)
113-
elif sys.version_info[:2] in ((3, 5), (3, 6), (3, 7), (3, 8), (3, 9), (3, 10), (3, 11)):
114-
vcvarsall = msvc9compiler.find_vcvarsall(14.0)
115-
if vcvarsall is None or not os.path.exists(vcvarsall):
116-
raise RuntimeError('Error finding vcvarsall.')
117-
118-
if is_python_64bit():
119-
env.update(get_environment_from_batch_command(
120-
[vcvarsall, 'amd64'],
121-
initial=os.environ.copy()))
122-
else:
123-
env.update(get_environment_from_batch_command(
124-
[vcvarsall, 'x86'],
125-
initial=os.environ.copy()))
126-
127-
elif sys.version_info[:2] in ((3, 3), (3, 4)):
128-
if is_python_64bit():
129-
env.update(get_environment_from_batch_command(
130-
[r"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd", '/x64'],
131-
initial=os.environ.copy()))
132-
else:
133-
env.update(get_environment_from_batch_command(
134-
[r"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd", '/x86'],
135-
initial=os.environ.copy()))
106+
if 'GITHUB_ACTION' not in os.environ:
107+
env = os.environ.copy()
108+
if sys.version_info[:2] in ((3, 6), (3, 7), (3, 8), (3, 9), (3, 10), (3, 11)):
109+
FORCE_PYDEVD_VC_VARS = os.environ.get('FORCE_PYDEVD_VC_VARS')
110+
if FORCE_PYDEVD_VC_VARS:
111+
env.update(get_environment_from_batch_command([FORCE_PYDEVD_VC_VARS], initial=os.environ.copy()))
112+
else:
113+
import setuptools # We have to import it first for the compiler to be found
114+
from distutils import msvc9compiler
115+
116+
vcvarsall = msvc9compiler.find_vcvarsall(14.0)
117+
if vcvarsall is None or not os.path.exists(vcvarsall):
118+
msvc_version = msvc9compiler.get_build_version()
119+
print('msvc_version', msvc_version)
120+
vcvarsall = msvc9compiler.find_vcvarsall(msvc_version)
121+
122+
if vcvarsall is None or not os.path.exists(vcvarsall):
123+
raise RuntimeError('Error finding vcvarsall.')
124+
125+
if is_python_64bit():
126+
env.update(get_environment_from_batch_command(
127+
[vcvarsall, 'amd64'],
128+
initial=os.environ.copy()))
129+
else:
130+
env.update(get_environment_from_batch_command(
131+
[vcvarsall, 'x86'],
132+
initial=os.environ.copy()))
136133

137-
else:
138-
raise AssertionError('Unable to setup environment for Python: %s' % (sys.version,))
134+
else:
135+
raise AssertionError('Unable to setup environment for Python: %s' % (sys.version,))
139136

140-
env['MSSdk'] = '1'
141-
env['DISTUTILS_USE_SDK'] = '1'
137+
env['MSSdk'] = '1'
138+
env['DISTUTILS_USE_SDK'] = '1'
142139

143140
additional_args = []
144141
for arg in sys.argv:

‎src/debugpy/_vendored/pydevd/build_tools/build_binaries_windows.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,12 @@
1616
miniconda_envs = os.getenv('MINICONDA_ENVS', r'C:\bin\Miniconda3\envs')
1717

1818
python_installations = [
19-
20-
r'%s\py36_32\python.exe' % miniconda_envs,
21-
r'%s\py37_32\python.exe' % miniconda_envs,
22-
r'%s\py38_32\python.exe' % miniconda_envs,
23-
r'%s\py39_32\python.exe' % miniconda_envs,
24-
r'%s\py310_32\python.exe' % miniconda_envs,
25-
2619
r'%s\py36_64\python.exe' % miniconda_envs,
2720
r'%s\py37_64\python.exe' % miniconda_envs,
2821
r'%s\py38_64\python.exe' % miniconda_envs,
2922
r'%s\py39_64\python.exe' % miniconda_envs,
3023
r'%s\py310_64\python.exe' % miniconda_envs,
24+
r'%s\py311_64\python.exe' % miniconda_envs,
3125
]
3226

3327
root_dir = os.path.dirname(os.path.dirname(__file__))

0 commit comments

Comments
 (0)