diff --git a/common.cfg b/common.cfg index bf3dd1c2ec5ca8539783256614f886339ad90d8f..09bd0c7ce1a42d5f8de5fcc0c2ed5d35ad93b180 100644 --- a/common.cfg +++ b/common.cfg @@ -12,7 +12,7 @@ versions = versions [versions] django = >=1.11,<2.0 django-rest-swagger = >2.1 -django-guardian = >=1.3 +django-guardian = >=1.4,<2.0 djangorestframework = >3.7 django-activity-stream = >= 0.6.5 django-jsonfield = >= 1.0.1 diff --git a/dev.yml b/dev.yml index f70a75bf44d948ddbab604cd256e9e34e06ea7f3..60f3caef81231880db1de33a5f7aedcfba0113d1 100644 --- a/dev.yml +++ b/dev.yml @@ -4,13 +4,19 @@ channels: - http://www.idiap.ch/software/beat/conda - defaults dependencies: + - pip + # packages you may pin are here - python=3.6 - bob-devel=2019.08.28 - beat-devel=2019.08.28 + # beat dependencies matching release.cfg + - beat.core=1.9.0 + - beat.backend.python=1.7.2 + - beat.cmdline=1.5.0 + # requirements.txt, they are indirectly pinned through the above - - beat.core=1.8 - docopt - docutils - jinja2 @@ -21,7 +27,6 @@ dependencies: - simplejson # these are required for local development, they are not runtime - - beat.cmdline - bob.extension - nose - coverage @@ -36,7 +41,7 @@ dependencies: - pip: - django>=1.11,<2.0 - django-activity-stream>=0.6,<0.7 - - django-guardian>=1.4,<1.5 + - django-guardian>=1.4,<2.0 - django-jsonfield>=1.0,<1.1 - django-jsonfield-compat>=0.4,<0.5 - django-post_office>=3.1,<3.2 diff --git a/release.cfg b/release.cfg index 5f09b4484d1f7b04c6898bb29dae8ba8c38d1038..598df974cd524e025363f8aae51484b8f291ad5d 100644 --- a/release.cfg +++ b/release.cfg @@ -14,7 +14,7 @@ develop = src/beat.backend.python [versions] django = >=1.11,<2.0 django-rest-swagger = >2.1 -django-guardian = >=1.3 +django-guardian = >=1.4,<2.0 djangorestframework = >3.7 django-activity-stream = >= 0.6.5 django-jsonfield = >= 1.0.1 @@ -24,9 +24,9 @@ eggs = ${buildout:eggs} interpreter = python [sources] -beat.core = git https://gitlab.idiap.ch/beat/beat.core.git rev=v1.8.0 -beat.cmdline = git https://gitlab.idiap.ch/beat/beat.cmdline.git rev=v1.4.1 -beat.backend.python = git https://gitlab.idiap.ch/beat/beat.backend.python.git rev=v1.6.2 +beat.core = git https://gitlab.idiap.ch/beat/beat.core.git rev=v1.9.0 +beat.cmdline = git https://gitlab.idiap.ch/beat/beat.cmdline.git rev=v1.5.0 +beat.backend.python = git https://gitlab.idiap.ch/beat/beat.backend.python.git rev=v1.7.2 [uwsgi] recipe = buildout.recipe.uwsgi