Merge branch 'main' into dependabot/npm_and_yarn/typescript-eslint/pa…

…rser-5.0.0
github · Oct 21, 2021 · 04a87f0 · 04a87f0
2 parents e2f39a6 + ecffc3c
commit 04a87f0
Showing 23 changed files with 352 additions and 49 deletions.
diff --git a/.github/workflows/python-deps.yml b/.github/workflows/python-deps.yml
@@ -58,7 +58,7 @@ jobs:
 
     - name: Verify packages installed
       run: |
-        $GITHUB_WORKSPACE/python-setup/tests/check_requests_123.sh ${PYTHON_VERSION}
+        $GITHUB_WORKSPACE/python-setup/tests/check_requests_2_26_0.sh ${PYTHON_VERSION}
 
   # This one shouldn't fail, but also won't install packages
   test-setup-python-scripts-non-standard-location:
@@ -123,6 +123,10 @@ jobs:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - uses: actions/checkout@v2
 
+    - uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+
     - name: Initialize CodeQL
       uses: ./init
       with:
@@ -149,5 +153,5 @@ jobs:
 
     - name: Verify packages installed
       run: |
-        $cmd = $Env:GITHUB_WORKSPACE + "\\python-setup\\tests\\check_requests_123.ps1"
+        $cmd = $Env:GITHUB_WORKSPACE + "\\python-setup\\tests\\check_requests_2_26_0.ps1"
         powershell -File $cmd $Env:PYTHON_VERSION
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 No user facing changes.
 
+## 1.0.19 - 18 Oct 2021
+
+No user facing changes.
+
 ## 1.0.18 - 08 Oct 2021
 
 - Fixed a bug where some builds were no longer being traced correctly. [#766](https://github.com/github/codeql-action/pull/766)

diff --git a/lib/defaults.json b/lib/defaults.json
@@ -1,3 +1,3 @@
 {
-    "bundleVersion": "codeql-bundle-20211005"
+    "bundleVersion": "codeql-bundle-20211013"
 }
diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codeql",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "private": true,
   "description": "CodeQL action",
   "scripts": {

diff --git a/python-setup/tests/check_requests_123.ps1 → python-setup/tests/check_requests_2_26_0.ps1 b/python-setup/tests/check_requests_123.ps1 → python-setup/tests/check_requests_2_26_0.ps1
@@ -18,11 +18,11 @@ $env:PYTHONPATH=$FOUND_PYTHONPATH
 
 $INSTALLED_REQUESTS_VERSION = (py -3 -c "import requests; print(requests.__version__)")
 
-$EXPECTED_REQUESTS="1.2.3"
+$EXPECTED_REQUESTS="2.26.0"
 
 if ($INSTALLED_REQUESTS_VERSION -ne $EXPECTED_REQUESTS) {
     write-host "Using $FOUND_PYTHONPATH as PYTHONPATH, we found version $INSTALLED_REQUESTS_VERSION of requests, but expected $EXPECTED_REQUESTS"
     exit 1
 } else {
     write-host "Using $FOUND_PYTHONPATH as PYTHONPATH, we found version $INSTALLED_REQUESTS_VERSION of requests, which was expected"
-}
+}
diff --git a/python-setup/tests/check_requests_123.sh → python-setup/tests/check_requests_2_26_0.sh b/python-setup/tests/check_requests_123.sh → python-setup/tests/check_requests_2_26_0.sh
@@ -22,11 +22,11 @@ PYTHON_EXE="python${EXPECTED_VERSION}"
 
 INSTALLED_REQUESTS_VERSION=$(PYTHONPATH="${FOUND_PYTHONPATH}" "${PYTHON_EXE}" -c 'import requests; print(requests.__version__)')
 
-EXPECTED_REQUESTS="1.2.3"
+EXPECTED_REQUESTS="2.26.0"
 
 if [[ "$INSTALLED_REQUESTS_VERSION" != "$EXPECTED_REQUESTS" ]]; then
     echo "Using ${FOUND_PYTHONPATH} as PYTHONPATH, we found version $INSTALLED_REQUESTS_VERSION of requests, but expected $EXPECTED_REQUESTS"
     exit 1
 else
     echo "Using ${FOUND_PYTHONPATH} as PYTHONPATH, we found version $INSTALLED_REQUESTS_VERSION of requests, which was expected"
-fi
+fi
diff --git a/python-setup/tests/pipenv/python-3.8/Pipfile.lock b/python-setup/tests/pipenv/python-3.8/Pipfile.lock
diff --git a/python-setup/tests/pipenv/requests-2/Pipfile.lock b/python-setup/tests/pipenv/requests-2/Pipfile.lock
diff --git a/python-setup/tests/pipenv/requests-3/Pipfile.lock b/python-setup/tests/pipenv/requests-3/Pipfile.lock
diff --git a/python-setup/tests/poetry/python-3.8/poetry.lock b/python-setup/tests/poetry/python-3.8/poetry.lock
diff --git a/python-setup/tests/poetry/requests-2/poetry.lock b/python-setup/tests/poetry/requests-2/poetry.lock
diff --git a/python-setup/tests/poetry/requests-3/poetry.lock b/python-setup/tests/poetry/requests-3/poetry.lock
diff --git a/python-setup/tests/poetry/requests-3/pyproject.toml b/python-setup/tests/poetry/requests-3/pyproject.toml
@@ -5,7 +5,7 @@ description = ""
 authors = ["Your Name <you@example.com>"]
 
 [tool.poetry.dependencies]
-python = "^3.5"
+python = "^3.6"
 requests = "*"
 
 [tool.poetry.dev-dependencies]

diff --git a/python-setup/tests/requirements/non-standard-location/non-standard/requirements.txt b/python-setup/tests/requirements/non-standard-location/non-standard/requirements.txt
@@ -1 +1 @@
-requests==1.2.3
+requests==2.26.0
diff --git a/python-setup/tests/requirements/requests-2/requirements.txt b/python-setup/tests/requirements/requests-2/requirements.txt
@@ -1 +1 @@
-requests==1.2.3
+requests==2.26.0
diff --git a/python-setup/tests/requirements/requests-3/requirements.txt b/python-setup/tests/requirements/requests-3/requirements.txt
@@ -1 +1 @@
-requests==1.2.3
+requests==2.26.0
diff --git a/python-setup/tests/setup_py/requests-2/setup.py b/python-setup/tests/setup_py/requests-2/setup.py
@@ -7,6 +7,6 @@
 
 setup(
     name="example-setup.py",
-    install_requires=["requests==1.2.3"],
+    install_requires=["requests==2.26.0"],
     python_requires=">=2.7, <3",
 )
diff --git a/python-setup/tests/setup_py/requests-3/setup.py b/python-setup/tests/setup_py/requests-3/setup.py
@@ -7,6 +7,6 @@
 
 setup(
     name="example-setup.py",
-    install_requires=["requests==1.2.3"],
-    python_requires='>=3.5',
+    install_requires=["requests==2.26.0"],
+    python_requires='>=3.7',
 )
diff --git a/runner/package-lock.json b/runner/package-lock.json
diff --git a/runner/package.json b/runner/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codeql-runner",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "private": true,
   "description": "CodeQL runner",
   "scripts": {

diff --git a/src/defaults.json b/src/defaults.json
@@ -1,3 +1,3 @@
 {
-  "bundleVersion": "codeql-bundle-20211005"
+  "bundleVersion": "codeql-bundle-20211013"
 }