Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ In order to update the source, you would:

You might need to regenerate the Cython modules after any changes. This can be done by:

- Install Python latest (3.12 as of this writing)
- Install Python latest (3.14 as of this writing)
- pip install cython 'django>=1.9' 'setuptools>=0.9' 'wheel>0.21' twine
- On a windows machine:
- set FORCE_PYDEVD_VC_VARS=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat
Expand Down
6 changes: 6 additions & 0 deletions azure-pipelines/pipelines.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@ stages:
python.version: 3.12
py313:
python.version: 3.13
py314:
python.version: 3.14.0-rc.2

steps:

Expand Down Expand Up @@ -178,6 +180,8 @@ stages:
python.version: 3.12
py313:
python.version: 3.13
py314:
python.version: 3.14.0-rc.2

steps:

Expand Down Expand Up @@ -224,6 +228,8 @@ stages:
python.version: 3.12
py313:
python.version: 3.13
py314:
python.version: 3.14.0-rc.2

steps:

Expand Down
16 changes: 12 additions & 4 deletions azure-pipelines/templates/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,19 @@ steps:
displayName: Setup Python packages

- pwsh: |
$toxEnv = '$(python.version)'
if (-not $toxEnv.startsWith('pypy')) {
$toxEnv = 'py' + $toxEnv.Replace('.', '')
$raw = '$(python.version)'
if ($raw.StartsWith('pypy')) {
# For PyPy keep original pattern stripping dots after first two numeric components if needed later.
$toxEnv = 'py' + ($raw -replace '^pypy(\d+)\.(\d+).*$','$1$2')
}
echo 'tox environment: $toxEnv'
else {
# Extract major.minor even from prerelease like 3.14.0-rc.2 -> 3.14
$mm = [regex]::Match($raw,'^(\d+)\.(\d+)')
if (-not $mm.Success) { throw "Unable to parse python.version '$raw'" }
$toxEnv = 'py' + $mm.Groups[1].Value + $mm.Groups[2].Value
}
Write-Host "python.version raw: $raw"
Write-Host "Derived tox environment: $toxEnv"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tox didn't like '3.14.0-rc.2 ' so -> 3.14

python -m tox -e $toxEnv -- --junitxml=$(Build.ArtifactStagingDirectory)/tests.xml --debugpy-log-dir=$(Build.ArtifactStagingDirectory)/logs tests
displayName: Run tests using tox
env:
Expand Down
1 change: 1 addition & 0 deletions azure-pipelines/templates/use_python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ steps:
inputs:
versionSpec: $(python.version)
architecture: $(architecture)
allowUnstable: true
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this enables rc builds

displayName: Use Python $(python.version) $(architecture)
18 changes: 9 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,12 @@ def finalize_options(self):
"Compiling pydevd Cython extension modules (set SKIP_CYTHON_BUILD=1 to omit)."
)
try:
subprocess.check_call(
[
sys.executable,
os.path.join(PYDEVD_ROOT, "setup_pydevd_cython.py"),
"build_ext",
"--inplace",
]
)
subprocess.check_call([
sys.executable,
os.path.join(PYDEVD_ROOT, "setup_pydevd_cython.py"),
"build_ext",
"--inplace",
])
except subprocess.SubprocessError:
# pydevd Cython extensions are optional performance enhancements, and debugpy is
# usable without them. Thus, we want to ignore build errors here by default, so
Expand Down Expand Up @@ -170,6 +168,8 @@ def tail_is(*suffixes):
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
"Topic :: Software Development :: Debuggers",
"Operating System :: Microsoft :: Windows",
"Operating System :: MacOS",
Expand Down Expand Up @@ -202,5 +202,5 @@ def tail_is(*suffixes):
"debugpy-adapter = debugpy.adapter.__main__:main",
],
},
**extras
**extras,
)
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ enum PythonVersion {
PythonVersion_311 = 0x030B,
PythonVersion_312 = 0x030C,
PythonVersion_313 = 0x030D,
PythonVersion_314 = 0x030E,
};


Expand Down Expand Up @@ -78,6 +79,9 @@ static PythonVersion GetPythonVersion(void *module) {
if(version[3] == '3'){
return PythonVersion_313;
}
if(version[3] == '4'){
return PythonVersion_314;
}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this fixed the tests

}
return PythonVersion_Unknown; // we don't care about 3.1 anymore...

Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py{38,39,310,311,312,313}{,-cov}
envlist = py{38,39,310,311,312,313,314}{,-cov}

[testenv]
deps = -rtests/requirements.txt
Expand All @@ -10,5 +10,5 @@ commands_pre = python build_attach_binaries.py
commands =
py{38,39}-!cov: python -m pytest {posargs}
py{38,39}-cov: python -m pytest --cov --cov-append --cov-config=.coveragerc {posargs}
py{310,311,312,313}-!cov: python -Xfrozen_modules=off -m pytest {posargs}
py{310,311,312,313}-cov: python -Xfrozen_modules=off -m pytest --cov --cov-append --cov-config=.coveragerc {posargs}
py{310,311,312,313,314}-!cov: python -Xfrozen_modules=off -m pytest {posargs}
py{310,311,312,313,314}-cov: python -Xfrozen_modules=off -m pytest --cov --cov-append --cov-config=.coveragerc {posargs}
Loading