Fixes les commandes d'execution pour python

Rends git ignorant du cache python
Fixes les commandes d'execution pour python en local
Ajoutes une commande d'execution de la CI selon la branche cicd
This commit is contained in:
Simon Pistache 2023-05-14 23:39:14 +02:00
parent f83c6b7988
commit 85803e95f1
3 changed files with 31 additions and 7 deletions

3
.gitignore vendored
View File

@ -1,3 +1,6 @@
# Ignore node_module # Ignore node_module
**/node_modules/ **/node_modules/
# Ignore python stuff
**/__pycache__

View File

@ -16,7 +16,8 @@ variables:
image: node:latest image: node:latest
rules: rules:
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
when: never # Do not run this job when a tag is created manually when: never
- if: CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd"
- changes: - changes:
- ${ENTRY_FOLDER}/${PACKAGE_NAME}/* - ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
script: script:
@ -40,12 +41,13 @@ manifest-job/valid_set:
stage: Test stage: Test
image: python:latest image: python:latest
rules: rules:
- if: CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd"
- if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_PIPELINE_SOURCE == "merge_request_event"
changes: changes:
- ${ENTRY_FOLDER}/${PACKAGE_NAME}/* - ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
script: script:
- pip install -U pytest pillow iteration_utilities - pip install -U pytest pillow iteration_utilities
- python -m pytest src/test_images_job/test_wpp.py --tb=line -rA --color=yes --code-highlight=yes -q - python -m pytest src/test_images.py --tb=line -rA
allow_failure: true allow_failure: true
test-images-job/valid_set: test-images-job/valid_set:
@ -64,7 +66,7 @@ test-images-job/missing_tag_set:
image: javieraviles/zip:latest image: javieraviles/zip:latest
rules: rules:
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
when: never # Do not run this job when a tag is created manually when: never
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
changes: changes:
- ${ENTRY_FOLDER}/${PACKAGE_NAME}/* - ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
@ -91,7 +93,7 @@ bundle-job/missing_tag_set:
image: curlimages/curl:latest image: curlimages/curl:latest
rules: rules:
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
when: never # Do not run this job when a tag is created manually when: never
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
changes: changes:
- ${ENTRY_FOLDER}/${PACKAGE_NAME}/* - ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
@ -120,7 +122,7 @@ upload-job/missing_tag_set:
image: registry.gitlab.com/gitlab-org/release-cli:latest image: registry.gitlab.com/gitlab-org/release-cli:latest
rules: rules:
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
when: never # Do not run this job when a tag is created manually when: never
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
changes: changes:
- ${ENTRY_FOLDER}/${PACKAGE_NAME}/* - ${ENTRY_FOLDER}/${PACKAGE_NAME}/*

23
.vscode/launch.json vendored
View File

@ -2,7 +2,7 @@
"version": "0.2.0", "version": "0.2.0",
"configurations": [ "configurations": [
{ {
"name": "Gen Valid_set", "name": "Gen-Manifest Valid_set",
"cwd": "${workspaceFolder}/src", "cwd": "${workspaceFolder}/src",
"type": "node", "type": "node",
"request": "launch", "request": "launch",
@ -20,7 +20,7 @@
], ],
}, },
{ {
"name": "Test Valid_set", "name": "Test-Manifest Valid_set",
"cwd": "${workspaceFolder}/src", "cwd": "${workspaceFolder}/src",
"type": "node", "type": "node",
"request": "launch", "request": "launch",
@ -37,5 +37,24 @@
"<node_internals>/**" "<node_internals>/**"
], ],
}, },
{
"name": "Test-Images Valid_set",
"cwd": "${workspaceFolder}/src",
"console": "internalConsole",
"type": "python",
"request": "launch",
"module": "pytest",
"args": [
"test_images.py",
"-rA",
"--tb=line",
"--color=yes"
],
"env": {
"ENTRY_FOLDER": "${workspaceFolder}/test",
"PACKAGE_NAME": "valid_set"
},
"justMyCode": true
},
] ]
} }