Skip to content
This repository has been archived by the owner on Aug 27, 2024. It is now read-only.

Commit

Permalink
Merge branch 'up42:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
chanange authored May 22, 2024
2 parents 2c9c3d9 + a1ccfab commit 4912b42
Show file tree
Hide file tree
Showing 90 changed files with 1,692 additions and 11,660 deletions.
75 changes: 49 additions & 26 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
test:
working_directory: *workspace-dir
docker:
- image: cimg/python:3.11
resource_class: medium+
- image: cimg/python:3.12
resource_class: large
steps:
- attach_workspace:
at: *workspace-dir
Expand Down Expand Up @@ -63,29 +63,60 @@ jobs:
- .coverage-reports
- .circleci
- sonar-project.properties
sonar:

test-python:
parameters:
python-version:
type: string
default: "3.11"
working_directory: *workspace-dir
docker:
- image: cimg/base:2021.04
- image: cimg/python:<< parameters.python-version >>
resource_class: large
steps:
- attach_workspace:
at: *workspace-dir
- sonarcloud/scan:
sonar_token_variable_name: SONAR_TOKEN

test_live:
docker:
- image: cimg/python:3.11
steps:
- checkout
- restore_cache:
name: Restoring poetry cache
keys:
- *venv-cache
- run:
name: Install requirements
command: |
poetry lock
poetry install --no-ansi
poetry install --no-interaction --no-ansi
- save_cache:
name: Saving poetry cache
key: *venv-cache
paths:
- .venv
- restore_cache:
name: Restoring pre-commit cache
keys:
- *pre-commit-cache
- run:
name: Running pre-commit
command: poetry run pre-commit run --all
- save_cache:
name: Saving pre-commit cache
key: *pre-commit-cache
paths:
- ~/.cache/pre-commit
- run:
name: Running tests
command: poetry run pytest --runlive --durations=5
command: poetry run pytest

sonar:
working_directory: *workspace-dir
docker:
- image: cimg/base:2021.04
steps:
- attach_workspace:
at: *workspace-dir
- sonarcloud/scan:
sonar_token_variable_name: SONAR_TOKEN

deploy:
docker:
- image: cimg/python:3.11
Expand All @@ -103,13 +134,17 @@ workflows:
context: sonarcloud
requires:
- test
- test-python:
matrix:
parameters:
python-version: [ "3.9", "3.10", "3.11" ]
- automated-test/run-sdk-tests:
requires:
- test
machine-size: medium+
name: sdk-e2e-tests
fingerprint: 'c5:5a:28:b3:5e:21:8d:9c:6c:b1:9b:a7:7b:f3:41:0c'
run-command: poetry run pytest spec --junitxml=./report/junit.xml
run-command: make test-all
context:
- 'sdk-tests-staging-build'
post-steps:
Expand All @@ -133,15 +168,3 @@ workflows:
filters:
branches:
only: master

test_live:
triggers:
- schedule:
cron: "0 0 * * *"
filters:
branches:
only:
- master
jobs:
- test_live:
context: up42-py-live-testing
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
* @up42/data-science
* @up42-eva @javidq @andher1802 @jmigueldelgado @seedlit
/examples/ @up42/documentation
/docs/ @up42/documentation
*.md @up42/documentation
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ repos:
- id: isort
args: ["--profile", "black", "--line-length", "120",]
- repo: https://github.com/PyCQA/flake8
rev: 6.0.0
rev: 7.0.0
hooks:
- id: flake8
args: ["--max-line-length=120"]
Expand Down
Loading

0 comments on commit 4912b42

Please sign in to comment.