Skip to content
Snippets Groups Projects
Commit d7b86262270a authored by Arthur Lutz's avatar Arthur Lutz
Browse files

chore(gitlab-ci): use templates and tox similar to other projects

parent 2d7490cb5c4f
No related branches found
No related tags found
1 merge request!37chore(gitlab-ci): use templates and tox similar to other projects
Pipeline #76549 passed
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
- "templates/lint/flake8.yml" # will do the equivalent of 'tox -e flake8' - "templates/lint/flake8.yml" # will do the equivalent of 'tox -e flake8'
- "templates/lint/check-manifest.yml" # will do the equivalent of 'tox -e check-manifest' - "templates/lint/check-manifest.yml" # will do the equivalent of 'tox -e check-manifest'
- "templates/lint/yamllint.yml" # will do the equivalent of 'tox -e yamllint' - "templates/lint/yamllint.yml" # will do the equivalent of 'tox -e yamllint'
- "templates/tests/py27.yml" # will do the equivalent of 'tox -e py27'
- "templates/tests/py3.yml" # will do the equivalent of 'tox -e py3' - "templates/tests/py3.yml" # will do the equivalent of 'tox -e py3'
- "templates/create-release-on-heptapod.yml" # this will create a release on heptapod - "templates/create-release-on-heptapod.yml" # this will create a release on heptapod
- "templates/upload-to-pypi.yml" # on a new mercurial tag (expected to be done with release-new), will push a release on pypi - "templates/upload-to-pypi.yml" # on a new mercurial tag (expected to be done with release-new), will push a release on pypi
......
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
recursive-include cubicweb_s3storage/wdoc * recursive-include cubicweb_s3storage/wdoc *
recursive-include test/data bootstrap_cubes *.py recursive-include test/data bootstrap_cubes *.py
include tox.ini include tox.ini
include dev-requirements.txt
recursive-include debian changelog compat control copyright rules
include cubicweb-s3storage.spec include cubicweb-s3storage.spec
exclude .gitlab-ci.yml exclude .gitlab-ci.yml
exclude .yamllint exclude .yamllint
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
'help': 'Add a temporary suffix to S3 keys during transaction', 'help': 'Add a temporary suffix to S3 keys during transaction',
'group': 's3', 'group': 's3',
'level': 2}), 'level': 2}),
) )
class STKEY(FunctionDescr): class STKEY(FunctionDescr):
......
git+https://github.com/psycojoker/pytest-capture-deprecatedwarnings
mock
moto
[tox] [tox]
envlist = py27,py3,flake8,check-manifest,yamllint envlist = py3,flake8,check-manifest,yamllint
[testenv] [testenv]
deps = deps =
pytest pytest
...@@ -3,9 +3,6 @@ ...@@ -3,9 +3,6 @@
[testenv] [testenv]
deps = deps =
pytest pytest
boto3 -rdev-requirements.txt
moto
py27: cubicweb<3.27
git+https://github.com/psycojoker/pytest-capture-deprecatedwarnings
commands = commands =
...@@ -11,5 +8,10 @@ ...@@ -11,5 +8,10 @@
commands = commands =
{envpython} -m pytest {posargs:test} {envpython} -m pytest {posargs:-vvx}
[pytest]
python_files = *test_*.py
testpaths = test
addopts = -r fEs
[testenv:check-manifest] [testenv:check-manifest]
skip_install = true skip_install = true
...@@ -20,4 +22,5 @@ ...@@ -20,4 +22,5 @@
{envpython} -m check_manifest {envpython} -m check_manifest
[testenv:flake8] [testenv:flake8]
basepython = python3
skip_install = true skip_install = true
...@@ -23,5 +26,3 @@ ...@@ -23,5 +26,3 @@
skip_install = true skip_install = true
whitelist_externals =
flake8
deps = deps =
flake8 flake8
...@@ -26,5 +27,5 @@ ...@@ -26,5 +27,5 @@
deps = deps =
flake8 flake8
commands = flake8 commands = {envpython} -m flake8 {toxinidir} {posargs}
[flake8] [flake8]
...@@ -29,6 +30,8 @@ ...@@ -29,6 +30,8 @@
[flake8] [flake8]
exclude = cubicweb_s3storage/migration/*,test/data/*,.tox/* max-line-length = 100
ignore = E731,W503
exclude = cubicweb_s3storage/__pkginfo__.py,cubicweb_s3storage/migration/*,test/data/*,.tox/*
[testenv:pypi-publish] [testenv:pypi-publish]
basepython = python3 basepython = python3
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment