[Snyk] Upgrade minimatch from 5.1.0 to 5.1.6

.eslintrc

@@ -69,6 +69,7 @@
         "no-control-regex": "off",
         "no-extend-native": "off",
         "no-multi-str": "off",
+        "no-shadow": "off",
         "no-param-reassign": "off",
         "no-prototype-builtins": "off",
         "no-restricted-syntax": [

.github/actions/smoke-tests/action.yml

@@ -43,7 +43,7 @@ runs:
 
     # Bits from the VSIX are reused by smokeTest.ts to speed things up.
     - name: Download VSIX
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: ${{ inputs.artifact_name }}
 

.gitignore

@@ -49,3 +49,8 @@ dist/**
 package.nls.*.json
 l10n/
 python-env-tools/**
+# coverage files produced as test output
+python_files/tests/*/.data/.coverage*
+python_files/tests/*/.data/*/.coverage*
+src/testTestingRootWkspc/coverageWorkspace/.coverage
+

.vscode/launch.json

@@ -127,6 +127,9 @@
                 "--extensionDevelopmentPath=${workspaceFolder}",
                 "--extensionTestsPath=${workspaceFolder}/out/test"
             ],
+            "env": {
+                "VSC_PYTHON_CI_TEST_GREP": "" // Modify this to run a subset of the single workspace tests
+            },
             "sourceMaps": true,
             "smartStep": true,
             "outFiles": ["${workspaceFolder}/out/**/*", "!${workspaceFolder}/**/node_modules**/*"],

build/azure-pipeline.pre-release.yml

@@ -31,7 +31,6 @@ extends:
     ghCreateTag: false
     standardizedVersioning: true
     l10nSourcePaths: ./src/client
-    needsTools: true
 
     buildPlatforms:
       - name: Linux
@@ -98,27 +97,30 @@ extends:
       - script: npx gulp prePublishBundle
         displayName: Build
 
-      - script: nox --session azure_pet_checkout
-        displayName: Checkout python-environment-tools
-        env:
-            PYTHON_ENV_TOOLS_DEST: $(Build.SourcesDirectory)
-            PYTHON_ENV_TOOLS_REF: main
-            PYTHON_ENV_TOOLS_TEMP: $(Agent.TempDirectory)
-
-      - script: nox --session azure_pet_build_before
-        displayName: Enable cargo config for azure
-
-      - template: azure-pipelines/extension/templates/steps/build-extension-rust-package.yml@templates
-        parameters:
-          vsceTarget: $(vsceTarget)
-          binaryName: pet
-          signing: true
-          workingDirectory: $(Build.SourcesDirectory)/python-env-tools
-          buildWasm: false
-          runTest: false
-
-      - script: nox --session azure_pet_build_after
-        displayName: Move bin to final location
+      - bash: |
+            mkdir -p $(Build.SourcesDirectory)/python-env-tools/bin
+            chmod +x $(Build.SourcesDirectory)/python-env-tools/bin
+        displayName: Make Directory for python-env-tool binary
+
+      - task: DownloadPipelineArtifact@2
+        inputs:
+            buildType: 'specific'
+            project: 'Monaco'
+            definition: 591
+            buildVersionToDownload: 'latestFromBranch'
+            branchName: 'refs/heads/main'
+            targetPath: '$(Build.SourcesDirectory)/python-env-tools/bin'
+            artifactName: 'bin-$(vsceTarget)'
+            itemPattern: |
+              pet.exe
+              pet
+              ThirdPartyNotices.txt
+
+      - bash: |
+            ls -lf ./python-env-tools/bin
+            chmod +x ./python-env-tools/bin/pet*
+            ls -lf ./python-env-tools/bin
+        displayName: Set chmod for pet binary
 
       - script: python -c "import shutil; shutil.rmtree('.nox', ignore_errors=True)"
         displayName: Clean up Nox

build/azure-pipeline.stable.yml

@@ -92,27 +92,30 @@ extends:
       - script: npx gulp prePublishBundle
         displayName: Build
 
-      - script: nox --session azure_pet_checkout
-        displayName: Checkout python-environment-tools
-        env:
-            PYTHON_ENV_TOOLS_DEST: $(Build.SourcesDirectory)
-            PYTHON_ENV_TOOLS_REF: release/2024.12
-            PYTHON_ENV_TOOLS_TEMP: $(Agent.TempDirectory)
-
-      - script: nox --session azure_pet_build_before
-        displayName: Enable cargo config for azure
-
-      - template: azure-pipelines/extension/templates/steps/build-extension-rust-package.yml@templates
-        parameters:
-          vsceTarget: $(vsceTarget)
-          binaryName: pet
-          signing: true
-          workingDirectory: $(Build.SourcesDirectory)/python-env-tools
-          buildWasm: false
-          runTest: false
-
-      - script: nox --session azure_pet_build_after
-        displayName: Move bin to final location
+      - bash: |
+            mkdir -p $(Build.SourcesDirectory)/python-env-tools/bin
+            chmod +x $(Build.SourcesDirectory)/python-env-tools/bin
+        displayName: Make Directory for python-env-tool binary
+
+      - task: DownloadPipelineArtifact@2
+        inputs:
+            buildType: 'specific'
+            project: 'Monaco'
+            definition: 593
+            buildVersionToDownload: 'latestFromBranch'
+            branchName: 'refs/heads/release/2024.14'
+            targetPath: '$(Build.SourcesDirectory)/python-env-tools/bin'
+            artifactName: 'bin-$(vsceTarget)'
+            itemPattern: |
+              pet.exe
+              pet
+              ThirdPartyNotices.txt
+
+      - bash: |
+            ls -lf ./python-env-tools/bin
+            chmod +x ./python-env-tools/bin/pet*
+            ls -lf ./python-env-tools/bin
+        displayName: Set chmod for pet binary
 
       - script: python -c "import shutil; shutil.rmtree('.nox', ignore_errors=True)"
         displayName: Clean up Nox

build/functional-test-requirements.txt

@@ -1,3 +1,5 @@
 # List of requirements for functional tests
 versioneer
 numpy
+pytest
+pytest-cov

build/test-requirements.txt

@@ -27,3 +27,7 @@ namedpipe; platform_system == "Windows"
 
 # typing for Django files
 django-stubs
+
+# for coverage
+coverage
+pytest-cov

noxfile.py

@@ -27,6 +27,7 @@ def delete_dir(path: pathlib.Path, ignore_errors=None):
 
     shutil.rmtree(os.fspath(path))
 
+
 @nox.session()
 def install_python_libs(session: nox.Session):
     requirements = [
@@ -63,79 +64,6 @@ def install_python_libs(session: nox.Session):
     if pathlib.Path("./python_files/lib/temp").exists():
         shutil.rmtree("./python_files/lib/temp")
 
-@nox.session()
-def azure_pet_checkout(session: nox.Session):
-    branch = os.getenv("PYTHON_ENV_TOOLS_REF", "main")
-
-    # dest dir should be <vscode-python repo root>/python-env-tools
-    dest_dir = (pathlib.Path(os.getenv("PYTHON_ENV_TOOLS_DEST")) / "python-env-tools").resolve()
-
-    # temp dir should be <agent temp dir>
-    temp_dir = (pathlib.Path(os.getenv("PYTHON_ENV_TOOLS_TEMP")) / "python-env-tools").resolve()
-    session.log(f"Cloning python-environment-tools to {temp_dir}")
-    temp_dir.mkdir(0o766, parents=True, exist_ok=True)
-
-    try:
-        with session.cd(temp_dir):
-            session.run("git", "init", external=True)
-            session.run(
-                "git",
-                "remote",
-                "add",
-                "origin",
-                "https://github.com/microsoft/python-environment-tools",
-                external=True,
-            )
-            session.run("git", "fetch", "origin", branch, external=True)
-            session.run(
-                "git", "checkout", "--force", "-B", branch, f"origin/{branch}", external=True
-            )
-            delete_dir(temp_dir / ".git")
-            delete_dir(temp_dir / ".github")
-            delete_dir(temp_dir / ".vscode")
-            (temp_dir / "CODE_OF_CONDUCT.md").unlink()
-            shutil.move(os.fspath(temp_dir), os.fspath(dest_dir))
-    except PermissionError as e:
-        print(f"Permission error: {e}")
-        if not dest_dir.exists():
-            raise
-    finally:
-        delete_dir(temp_dir, ignore_errors=True)
-
-
-@nox.session()
-def azure_pet_build_before(session: nox.Session):
-    source_dir = pathlib.Path(pathlib.Path.cwd() / "python-env-tools").resolve()
-    config_toml_disabled = source_dir / ".cargo" / "config.toml.disabled"
-    config_toml = source_dir / ".cargo" / "config.toml"
-    if config_toml_disabled.exists() and not config_toml.exists():
-        config_toml.write_bytes(config_toml_disabled.read_bytes())
-
-
-@nox.session()
-def azure_pet_build_after(session: nox.Session):
-    source_dir = pathlib.Path(pathlib.Path.cwd() / "python-env-tools").resolve()
-    ext = sysconfig.get_config_var("EXE") or ""
-    bin_name = f"pet{ext}"
-
-    abs_bin_path = None
-    for root, _, files in os.walk(os.fspath(source_dir / "target")):
-        bin_path = pathlib.Path(root) / "release" / bin_name
-        if bin_path.exists():
-            abs_bin_path = bin_path.absolute()
-            break
-
-    assert abs_bin_path
-
-    dest_dir = pathlib.Path(pathlib.Path.cwd() / "python-env-tools").resolve()
-    if not pathlib.Path(dest_dir / "bin").exists():
-        pathlib.Path(dest_dir / "bin").mkdir()
-    bin_dest = dest_dir / "bin" / bin_name
-    shutil.copyfile(abs_bin_path, bin_dest)
-
-    if sys.platform != "win32":
-        os.chmod(os.fspath(bin_dest), 0o755)
-
 
 @nox.session()
 def native_build(session: nox.Session):