diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 37e3deb..787c0e1 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -1,14 +1,3 @@ -# 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: @@ -38,9 +27,6 @@ jobs: fail-fast: false matrix: language: ["python"] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] - # Learn more: - # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed steps: - name: Checkout repository @@ -56,21 +42,5 @@ jobs: # Prefix the list here with "+" to use these queries and those in the config file. # queries: ./path/to/local/query, your-org/your-repo/queries@main - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v1 - - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl - - # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - #- run: | - # make bootstrap - # make release - - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v1 diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml index ef71c1f..b304557 100644 --- a/.github/workflows/python-test.yml +++ b/.github/workflows/python-test.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.7, 3.8, 3.9] + python-version: [3.7, 3.8, 3.9, 3.10.0] steps: - uses: actions/checkout@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 9652c71..2398736 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## v4.0.3 (2021-10-09) +### Fixes +- Test python 3.10 in CI. + ## v4.0.2 (2021-10-08) ### Fixes - fix: upgrade wiremind-kubernetes to ignore failed (like Evicted) Pods when stop-pods. diff --git a/VERSION b/VERSION index 4d54dad..c4e41f9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.2 +4.0.3 diff --git a/requirements.txt b/requirements.txt index d41acb2..9a7f046 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ alembic==1.7.4 # via chartreuse (setup.py) cachetools==4.2.4 # via google-auth -certifi==2021.5.30 +certifi==2021.10.8 # via # kubernetes # requests @@ -64,7 +64,7 @@ urllib3==1.26.7 # requests websocket-client==1.2.1 # via kubernetes -wiremind-kubernetes==6.3.3 +wiremind-kubernetes==6.3.5 # via chartreuse (setup.py) zipp==3.6.0 # via diff --git a/setup.py b/setup.py index daa81b1..eb697b7 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ install_requires=[ "alembic==1.*", "psycopg2==2.*", - "wiremind-kubernetes>=6.3.3", + "wiremind-kubernetes==6.*,>=6.3.5", ], extras_require={ "dev": extra_require_dev, diff --git a/src/chartreuse/tests/e2e_tests/conftest.py b/src/chartreuse/tests/e2e_tests/conftest.py index a014c82..2a1ccb0 100644 --- a/src/chartreuse/tests/e2e_tests/conftest.py +++ b/src/chartreuse/tests/e2e_tests/conftest.py @@ -40,11 +40,11 @@ def _cluster_init(include_chartreuse: bool, pre_upgrade: bool = False): else: additional_args = "--set chartreuse.enabled=true --set chartreuse.upgradeBeforeDeployment=false" run_command( - f"helm upgrade --install --wait {TEST_RELEASE} {HELM_CHART_PATH} --namespace {TEST_NAMESPACE} --timeout 120s {additional_args}", + f"helm install --wait {TEST_RELEASE} {HELM_CHART_PATH} --namespace {TEST_NAMESPACE} --timeout 180s {additional_args}", cwd=EXAMPLE_PATH, ) run_command( - f"helm upgrade --install --wait {TEST_RELEASE} {HELM_CHART_PATH} --namespace {TEST_NAMESPACE} --timeout 120s {additional_args}", + f"helm upgrade --wait {TEST_RELEASE} {HELM_CHART_PATH} --namespace {TEST_NAMESPACE} --timeout 60s {additional_args}", cwd=EXAMPLE_PATH, )