diff --git a/Makefile b/Makefile index 9d61bbd021..a7a696e9b4 100644 --- a/Makefile +++ b/Makefile @@ -125,7 +125,7 @@ increase-version: ## Increase the version number of the entire project's files. BUILD=`echo $$VERSION|awk '{split($$VERSION,a,"."); printf("0x%02d%02d%02d\n", a[1],a[2], a[3])}'`; \ sed -i -e "s/__build__ = 0x[0-9]*/__build__ = $${BUILD}/g" mayan/__init__.py; \ sed -i -e "s/__version__ = '[0-9\.]*'/__version__ = '$${VERSION}'/g" mayan/__init__.py; \ - echo $$VERSION > docker/version + echo $$VERSION > docker/rootfs/version make generate-setup python-test-release: ## Package (sdist and wheel) and upload to the PyPI test server. diff --git a/docker/rootfs/version b/docker/rootfs/version index c7a249882e..a8ae99db69 100755 --- a/docker/rootfs/version +++ b/docker/rootfs/version @@ -1 +1 @@ -3.1.10 +3.2b1 diff --git a/mayan/__init__.py b/mayan/__init__.py index 9c17bd7db0..6008dbd041 100644 --- a/mayan/__init__.py +++ b/mayan/__init__.py @@ -1,9 +1,9 @@ from __future__ import unicode_literals __title__ = 'Mayan EDMS' -__version__ = '3.1.10' -__build__ = 0x030110 -__build_string__ = 'v3.1.10-1-g51ea493a26_Thu Apr 4 22:03:19 2019 -0400' +__version__ = '3.2b1' +__build__ = 0x030200 +__build_string__ = 'v3.1.10-351-g72cdfe58c5_Thu May 9 20:30:48 2019 +0000' __django_version__ = '1.11' __author__ = 'Roberto Rosario' __author_email__ = 'roberto.rosario@mayan-edms.com' diff --git a/setup.py b/setup.py index dfa867fec4..d9576f8d36 100644 --- a/setup.py +++ b/setup.py @@ -57,14 +57,13 @@ def find_packages(directory): install_requires = """ Django==1.11.20 -Pillow==5.2.0 -PyYAML==3.13 +Pillow==6.0.0 +PyYAML==5.1 celery==3.1.24 -django-activity-stream==0.6.5 -django-autoadmin==1.1.1 +django-activity-stream==0.7.0 django-celery==3.2.1 -django-colorful==1.2 -django-cors-headers==2.2.0 +django-colorful==1.3 +django-cors-headers==2.5.2 django-downloadview==1.9 django-environ==0.4.5 django-formtools==2.1 @@ -73,33 +72,33 @@ django-mathfilters==0.4.0 django-model-utils==3.1.2 django-mptt==0.9.1 django-qsstats-magic==1.0.0 +django-solo==1.1.3 django-stronghold==0.3.0 -django-suit==0.2.26 -django-widget-tweaks==1.4.2 +django-widget-tweaks==1.4.3 djangorestframework==3.7.7 djangorestframework-recursive==0.1.2 -drf-yasg==1.5.0 +drf-yasg==1.6.0 flanker==0.9.0 -flex==6.13.2 -furl==1.2 -fusepy==2.0.4 -gevent==1.3.5 -graphviz==0.8.4 +flex==6.14.0 +furl==2.0.0 +fusepy==3.0.1 +gevent==1.4.0 +graphviz==0.10.1 gunicorn==19.9.0 mock==2.0.0 -node-semver==0.3.0 -pathlib2==2.3.2 -pycountry==18.5.26 +node-semver==0.6.1 +pathlib2==2.3.3 +pycountry==18.12.8 PyPDF2==1.26.0 -pyocr==0.5.2 -python-dateutil==2.7.3 +pyocr==0.6 +python-dateutil==2.8.0 python-gnupg==0.3.9 python-magic==0.4.15 -pytz==2018.3 -requests==2.18.4 +pytz==2019.1 +requests==2.21.0 sh==1.12.14 -swagger-spec-validator==2.1.0 -whitenoise==3.3.1 +swagger-spec-validator==2.4.3 +whitenoise==4.1.2 """.split() with open('README.rst') as f: