Unverified Commit 2740d53f authored by Thom Wiggers's avatar Thom Wiggers 📐
Browse files

Use pipenv instead of requirements.txt

parent 86bb6dab
...@@ -2,9 +2,8 @@ variables: ...@@ -2,9 +2,8 @@ variables:
POSTGRES_DB: thalia POSTGRES_DB: thalia
POSTGRES_USER: postgres POSTGRES_USER: postgres
POSTGRES_PASSWORD: "" POSTGRES_PASSWORD: ""
CI_DEPS: psycopg2-binary # https://hub.docker.com/r/thalia/python-thalia/
# https://hub.docker.com/r/twiggers/python-thalia/ # https://github.com/thaliawww/python-thalia
# https://github.com/thomwiggers/python-thalia
# Should get auto-updated with the official 'python' repository # Should get auto-updated with the official 'python' repository
# Installs: # Installs:
# - pip: tox, coverage # - pip: tox, coverage
......
[[source]]
url = "https://pypi.org/simple"
verify_ssl = true
name = "pypi"
[packages]
django-localflavor = "*"
django-sendfile = "*"
freezegun = "*"
bleach = "*"
"django-tinymce4-lite" = "*"
rcssmin = "*"
djangorestframework = "*"
django-ical = "*"
django-libsass = "*"
django-cors-headers = "*"
python-magic = "*"
pyfcm = "*"
celery = "*"
redis = "*"
raven = "*"
Django = ">=2.0,<2.1"
Pillow = "*"
django_compressor = "*"
django_celery_results = "*"
"psycopg2-binary" = "*"
bcrypt = "*"
django-slack = "!=5.7.2"
"argon2_cffi" = "*"
uWSGI = "*"
[dev-packages]
django-template-check = "*"
"flake8" = "*"
pydenticon = "*"
pylint = "*"
pylint-django = "*"
tox = "*"
Faker = "*"
factory_boy = "*"
coverage = "*"
[requires]
python_version = "3.6"
This diff is collapsed.
Django>=2.0.8,<2.1
django-localflavor>=2.0,<2.1
Pillow>=5.0,<5.1
django-compressor>=2.1,<3
django-sendfile<=0.4
freezegun>=0.3.9,<0.4.0
bleach>=2.1.0,<2.2
django-tinymce4-lite>=1.7,<1.8
rcssmin>=1.0.6
djangorestframework>=3.7.1,<3.8
django-ical>=1.4,<2
django-libsass>=0.7,<1
django-cors-headers>=2.1.0,<2.2
python-magic>=0.4.13,<0.5
pyfcm>=1.4.2,<1.5
celery>=4.0,<4.2
redis>=2.10,<2.11
django-celery-results>=1.0.1,<1.1
raven>=6.4.0,<6.5.0
[tox] [tox]
envlist = flake8, {py35,py36}-django20 envlist = flake8, {py35,py36,py37}-django20, {py35,py36,py37}-django21
skipsdist = True skipsdist = True
skip_missing_interpreters = True skip_missing_interpreters = True
...@@ -8,31 +8,22 @@ changedir={toxinidir}/website ...@@ -8,31 +8,22 @@ changedir={toxinidir}/website
commands = commands =
; Copy the env list to make not conflict with the Django version ; Copy the env list to make not conflict with the Django version
; specified below ; specified below
cp {toxinidir}/requirements.txt {envbindir}/reqtemp.txt pipenv --bare install --dev
sed -i /Django>=.*/d {envbindir}/reqtemp.txt ; override using pip. Using pipenv would write to Pipfile!
pip install -r{envbindir}/reqtemp.txt -r{toxinidir}/dev-requirements.txt django20: pip install 'django>=2.0rc1,<2.1'
# Issue https://gitlab.science.ru.nl/thalia/concrexit/issues/631 django21: pip install --pre 'django>=2.1rc1,<2.2'
#pipconflictchecker # if this fails, use pipdeptree to debug pipenv --bare run python manage.py check
python manage.py check pipenv --bare run python manage.py templatecheck --project-only
python manage.py templatecheck --project-only pipenv --bare run python manage.py makemigrations --no-input --check --dry-run
python manage.py makemigrations --no-input --check --dry-run pipenv --bare run python -Wall -mcoverage run --branch --source '.' manage.py test
python -Wall -mcoverage run --branch --source '.' manage.py test pipenv --bare check
safety check
deps = deps =
coverage pipenv
pip-conflict-checker
django20: django>=2.0rc1,<2.1
{env:CI_DEPS:}
passenv = passenv =
GITLAB_CI GITLAB_CI
PIP_CACHE_DIR PIP_CACHE_DIR
whitelist_externals= env =
sed PIPENV_SUPPRESS_NESTED_WARNING=1
cp
[flake8]
exclude = */migrations/*, */urls.py, .ropeproject
[testenv:flake8] [testenv:flake8]
deps= flake8 deps= flake8
...@@ -41,3 +32,7 @@ commands= ...@@ -41,3 +32,7 @@ commands=
flake8 . flake8 .
passenv = passenv =
PIP_CACHE_DIR PIP_CACHE_DIR
# Settings for Flake8
[flake8]
exclude = */migrations/*, */urls.py, .ropeproject
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment