Merge a644fb1 into 85d8436

inveniosoftware · Mar 5, 2020 · cb40894 · cb40894
2 parents 85d8436 + a644fb1
commit cb40894
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,8 +10,7 @@
 notifications:
   email: false
 
-sudo: false
-
+dist: xenial
 language: python
 
 cache:
@@ -35,8 +34,8 @@ env:
   - REQUIREMENTS=devel SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/travis"
 
 python:
-  - "2.7"
-  - "3.5"
+  - "3.6"
+  - "3.7"
 
 matrix:
   fast_finish: true
@@ -82,5 +81,5 @@ deploy:
   distributions: "compile_catalog sdist bdist_wheel"
   on:
     tags: true
-    python: "2.7"
+    python: "3.6"
     condition: $REQUIREMENTS = release
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -8,7 +8,11 @@
 Changes
 =======
 
-Version 1.1.1 (released 2019-11-18)
+Version 1.2.0 (released 2020-03-05)
+
+- Changes flask dependency to centrally managed
+
+Version 1.1.2 (released 2019-11-18)
 
 - Fixes werkzeug deprecation warning.
 

diff --git a/invenio_admin/version.py b/invenio_admin/version.py
@@ -14,4 +14,4 @@
 
 from __future__ import absolute_import, print_function
 
-__version__ = '1.1.2'
+__version__ = '1.2.0'
diff --git a/setup.py b/setup.py
@@ -18,14 +18,14 @@
 tests_require = [
     'check-manifest>=0.25',
     'coverage>=4.0',
-    'invenio-accounts>=1.0.0',
     'invenio-theme>=1.1.1',
     'isort>=4.2.2',
     'mock>=1.3.0',
     'pydocstyle>=1.0.0',
     'pytest-cov>=1.8.0',
     'pytest-pep8>=1.0.6',
-    'pytest>=2.8.0',
+    'pytest>=3.8.1',
+    'six>=1.12',
 ]
 
 extras_require = {
@@ -48,11 +48,11 @@
 ]
 
 install_requires = [
-    'Flask>=0.11.1',
-    'Flask-Admin>=1.5.3',
-    'Flask-Login>=0.3.0',
+    'Flask-Admin>=1.5.5',
     'Flask-Menu>=0.5.0',
     'Flask-Principal>=0.4.0',
+    'invenio-accounts>=1.1.3',
+    'invenio-base>=1.2.2',
     'invenio-db>=1.0.0',
 ]