From 3e903b048a74d359e207e70d54994d85fd92f9d6 Mon Sep 17 00:00:00 2001 From: Laetitia Getti Date: Wed, 5 Apr 2023 11:12:58 +0200 Subject: [PATCH] create gitlab-ci.yml --- dev-requirements.txt | 63 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dev-requirements.txt b/dev-requirements.txt index 07b445f..242393a 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -9,6 +9,7 @@ asgiref==3.6.0 attrs==22.2.0 # via pytest black==23.3.0 +<<<<<<< HEAD <<<<<<< HEAD # via pytest-black build==0.10.0 @@ -20,17 +21,32 @@ chardet==4.0.0 build==0.10.0 # via pip-tools >>>>>>> 7d1f998 (use pip-compile to generate requirements.txt) +======= + # via + # flake8-black + # pytest-black +build==0.10.0 + # via pip-tools +chardet==4.0.0 + # via diff-cover +>>>>>>> f0d0cd8 (create gitlab-ci.yml) click==8.1.3 # via # black # pip-tools <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f0d0cd8 (create gitlab-ci.yml) coverage[toml]==7.2.2 # via pytest-cov diff-cover==4.2.3 # via la-chariotte (pyproject.toml) +<<<<<<< HEAD ======= >>>>>>> 7d1f998 (use pip-compile to generate requirements.txt) +======= +>>>>>>> f0d0cd8 (create gitlab-ci.yml) django==4.2 # via la-chariotte (pyproject.toml) exceptiongroup==1.1.1 @@ -47,12 +63,24 @@ flake8==6.0.0 # via flake8-black flake8-black==0.3.6 # via la-chariotte (pyproject.toml) +<<<<<<< HEAD >>>>>>> 7d1f998 (use pip-compile to generate requirements.txt) +======= +importlib-metadata==6.1.0 + # via inflect +inflect==3.0.2 + # via + # diff-cover + # jinja2-pluralize +>>>>>>> f0d0cd8 (create gitlab-ci.yml) iniconfig==2.0.0 # via pytest isort==5.12.0 # via pytest-isort <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f0d0cd8 (create gitlab-ci.yml) jinja2==3.1.2 # via # diff-cover @@ -61,7 +89,10 @@ jinja2-pluralize==0.3.0 # via diff-cover markupsafe==2.1.2 # via jinja2 +<<<<<<< HEAD ======= +======= +>>>>>>> f0d0cd8 (create gitlab-ci.yml) mccabe==0.7.0 # via flake8 >>>>>>> 7d1f998 (use pip-compile to generate requirements.txt) @@ -80,28 +111,42 @@ platformdirs==3.2.0 # via black pluggy==1.0.0 <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f0d0cd8 (create gitlab-ci.yml) # via # diff-cover # pytest psycopg2-binary==2.9.6 +<<<<<<< HEAD # via la-chariotte (pyproject.toml) pygments==2.14.0 # via diff-cover ======= # via pytest psycopg2==2.9.6 +======= +>>>>>>> f0d0cd8 (create gitlab-ci.yml) # via la-chariotte (pyproject.toml) pycodestyle==2.10.0 # via flake8 pyflakes==3.0.1 # via flake8 +<<<<<<< HEAD >>>>>>> 7d1f998 (use pip-compile to generate requirements.txt) +======= +pygments==2.14.0 + # via diff-cover +>>>>>>> f0d0cd8 (create gitlab-ci.yml) pyproject-hooks==1.0.0 # via build pytest==7.2.2 # via # la-chariotte (pyproject.toml) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f0d0cd8 (create gitlab-ci.yml) # pytest-black # pytest-cov # pytest-django @@ -110,10 +155,13 @@ pytest-black==0.3.12 # via la-chariotte (pyproject.toml) pytest-cov==4.0.0 # via la-chariotte (pyproject.toml) +<<<<<<< HEAD ======= # pytest-django # pytest-isort >>>>>>> 7d1f998 (use pip-compile to generate requirements.txt) +======= +>>>>>>> f0d0cd8 (create gitlab-ci.yml) pytest-django==4.5.2 # via la-chariotte (pyproject.toml) pytest-isort==3.1.0 @@ -121,14 +169,20 @@ pytest-isort==3.1.0 sqlparse==0.4.3 # via django <<<<<<< HEAD +<<<<<<< HEAD toml==0.10.2 # via pytest-black ======= >>>>>>> 7d1f998 (use pip-compile to generate requirements.txt) +======= +toml==0.10.2 + # via pytest-black +>>>>>>> f0d0cd8 (create gitlab-ci.yml) tomli==2.0.1 # via # black # build +<<<<<<< HEAD <<<<<<< HEAD # coverage # pyproject-hooks @@ -138,11 +192,20 @@ wheel==0.40.0 zipp==3.15.0 # via importlib-metadata ======= +======= + # coverage +>>>>>>> f0d0cd8 (create gitlab-ci.yml) # flake8-black + # pyproject-hooks # pytest wheel==0.40.0 # via pip-tools +<<<<<<< HEAD >>>>>>> 7d1f998 (use pip-compile to generate requirements.txt) +======= +zipp==3.15.0 + # via importlib-metadata +>>>>>>> f0d0cd8 (create gitlab-ci.yml) # The following packages are considered to be unsafe in a requirements file: # pip