Skip to content

Commit

Permalink
ci: add 3.10 support
Browse files Browse the repository at this point in the history
  • Loading branch information
desaintmartin committed Oct 9, 2021
1 parent cedc828 commit 792f194
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 56 deletions.
13 changes: 0 additions & 13 deletions .github/workflows/black.yml

This file was deleted.

36 changes: 0 additions & 36 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,10 @@
# 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]
paths-ignore:
- "**/*.md"
- "doc/**"
pull_request:
branches: [main]
paths-ignore:
- "**/*.md"
- "doc/**"
schedule:
- cron: "14 3 * * 2"

Expand All @@ -38,9 +21,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
Expand All @@ -56,21 +36,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
13 changes: 12 additions & 1 deletion .github/workflows/python-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -66,3 +66,14 @@ jobs:
if: always() # always run even if the previous step fails
with:
report_paths: "junit.xml"

linter:
name: black-format
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: reviewdog/action-black@v2
with:
github_token: ${{ secrets.github_token }}
# Change reviewdog reporter if you need [github-pr-check, github-check].
reporter: github-pr-check
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.2
4.0.3
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions src/chartreuse/tests/e2e_tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)

Expand Down

0 comments on commit 792f194

Please sign in to comment.