From 15b6bfcdaafe04c8a3705347e77ef78bf12c2c3f Mon Sep 17 00:00:00 2001 From: Jylpah Date: Mon, 25 Dec 2023 14:31:40 +0200 Subject: [PATCH 1/4] Create codeql.yml --- .github/workflows/codeql.yml | 81 ++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 0000000..e2a7b39 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,81 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + schedule: + - cron: '36 0 * * 3' + +jobs: + analyze: + name: Analyze + # Runner size impacts CodeQL analysis time. To learn more, please see: + # - https://gh.io/recommended-hardware-resources-for-running-codeql + # - https://gh.io/supported-runners-and-hardware-resources + # - https://gh.io/using-larger-runners + # Consider using larger runners for possible analysis time improvements. + runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} + timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }} + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'python' ] + # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ] + # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both + # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both + # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + + # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs + # queries: security-extended,security-and-quality + + + # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v3 + + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + + # If the Autobuild fails above, remove it and uncomment the following three lines. + # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. + + # - run: | + # echo "Run, Build Application using script" + # ./location_of_script_within_repo/buildscript.sh + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 + with: + category: "/language:${{matrix.language}}" From 7986dc11031e1cd8f4f8d5d69fd81baae3b64cf3 Mon Sep 17 00:00:00 2001 From: Jylpah Date: Mon, 25 Dec 2023 14:32:44 +0200 Subject: [PATCH 2/4] Create dependency-review.yml --- .github/workflows/dependency-review.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/dependency-review.yml diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml new file mode 100644 index 0000000..b0dedc4 --- /dev/null +++ b/.github/workflows/dependency-review.yml @@ -0,0 +1,20 @@ +# Dependency Review Action +# +# This Action will scan dependency manifest files that change as part of a Pull Request, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging. +# +# Source repository: https://github.com/actions/dependency-review-action +# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement +name: 'Dependency Review' +on: [pull_request] + +permissions: + contents: read + +jobs: + dependency-review: + runs-on: ubuntu-latest + steps: + - name: 'Checkout Repository' + uses: actions/checkout@v3 + - name: 'Dependency Review' + uses: actions/dependency-review-action@v3 From e567eed3f5e669d693b31598ccc568832e69fb43 Mon Sep 17 00:00:00 2001 From: Jylpah Date: Mon, 25 Dec 2023 14:38:21 +0200 Subject: [PATCH 3/4] update dependencies to depend on major version only --- pyproject.toml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 9588cbc..214cbae 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,29 +16,29 @@ classifiers = [ "Topic :: Games/Entertainment", ] dependencies = [ - "aiofiles~=23.1.0", - "aiohttp~=3.8.4", - "aiosqlite~=0.19.0", - "isort~=5.12.0", - "pyarrow~=11.0.0", - "pydantic~=2.4.2", - "pymongo~=4.6.1", + "aiofiles~=23.1", + "aiohttp~=3.9", + "aiosqlite~=0.19", + "isort~=5.12", + "pyarrow~=11.0", + "pydantic~=2.4", + "pymongo~=4.6", "pyutils @ git+https://github.com/Jylpah/pyutils.git@main-1.0", "pydantic-exportables @ git+https://github.com/Jylpah/pydantic-exportables.git", ] [project.optional-dependencies] dev = [ - "build~=0.10.0", - "mypy~=1.7.2", - "pip-chill~=1.0.3", - "pip-audit~=2.6.1", - "pytest~=2.2.0", - "pytest-asyncio~=0.23.2", - "pytest-datafiles~=3.0.0", - "pytest-cov~=4.1.0", - "pytest-timeout~=2.2.0", - "types-aiofiles~=23.1.0.1", + "build~=0.10", + "mypy~=1.7", + "pip-chill~=1.0", + "pip-audit~=2.6", + "pytest~=7.4", + "pytest-asyncio~=0.23", + "pytest-datafiles~=3.0", + "pytest-cov~=4.1", + "pytest-timeout~=2.2", + "types-aiofiles~=23.1", ] [project.urls] From 52d22641cfa3953d09c713e6be530e1930919208 Mon Sep 17 00:00:00 2001 From: Jylpah Date: Mon, 25 Dec 2023 15:12:06 +0200 Subject: [PATCH 4/4] version 1.0.5 --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 214cbae..6aaa20e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "blitz-models" -version = "1.0.4" +version = "1.0.5" authors = [{ name = "Jylpah", email = "jylpah@gmail.com" }] description = "Pydantic models for Wargaming's World of Tanks Blitz game " readme = "README.md" @@ -17,7 +17,7 @@ classifiers = [ ] dependencies = [ "aiofiles~=23.1", - "aiohttp~=3.9", + "aiohttp~=3.9.1", "aiosqlite~=0.19", "isort~=5.12", "pyarrow~=11.0",