From 9df381ec4cfde65d9be5c02bd3cf725491a801d4 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Wed, 30 Jun 2021 15:26:53 +0200 Subject: [PATCH 1/3] Do not require requirements.txt in GitLab CI --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b93f3e4c3..6573d4dbe8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,8 +5,8 @@ tests: - virtualenv env - source env/bin/activate - pip install -U pip wheel setuptools - - XDG_CACHE_HOME=/cache pip3 install -r src/requirements.txt --no-use-pep517 -Ur src/requirements/dev.txt - cd src + - XDG_CACHE_HOME=/cache pip3 install -e ".[dev]" - python manage.py check - make all compress - py.test --reruns 3 -n 3 tests @@ -21,8 +21,8 @@ pypi: - virtualenv env - source env/bin/activate - pip install -U pip wheel setuptools check-manifest twine - - XDG_CACHE_HOME=/cache pip3 install -Ur src/requirements.txt -r src/requirements/dev.txt - cd src + - XDG_CACHE_HOME=/cache pip3 install -e ".[dev]" - python setup.py sdist - pip install dist/pretix-*.tar.gz - python -m pretix migrate From 6e7505abd5d9da495e566e1cde0d7db9ad510df3 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Wed, 30 Jun 2021 15:38:31 +0200 Subject: [PATCH 2/3] Add tests/plugins/sendmail to check-manifest ignore --- src/setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/src/setup.cfg b/src/setup.cfg index 3a0fcb1414..bba44ff238 100644 --- a/src/setup.cfg +++ b/src/setup.cfg @@ -109,4 +109,5 @@ ignore = tests/plugins/paypal/* tests/plugins/pretixdroid/* tests/plugins/stripe/* + tests/plugins/sendmail/* tests/plugins/ticketoutputpdf/* From 9894954233866b9955252d4c4ade9fbc22a7782f Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Wed, 30 Jun 2021 16:14:27 +0200 Subject: [PATCH 3/3] Add static files to check-manifest ignore list --- src/setup.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/setup.cfg b/src/setup.cfg index bba44ff238..50e67a1cb3 100644 --- a/src/setup.cfg +++ b/src/setup.cfg @@ -90,6 +90,8 @@ ignore = Makefile manage.py pretix/icons/* + pretix/static.dist/** + pretix/static/jsi18n/** requirements.txt requirements/* tests/*