Merge pull request pallets-eco#788 from pallets/bump-versions

bump minimum flask and sqlalchemy versions
krasoffski · Oct 11, 2019 · 324a670 · 324a670
2 parents 2d61aa8 + aaddfeb
commit 324a670
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,10 +8,8 @@ matrix:
   include:
     - python: 2.7
       env: TOXENV=py,py27-lowest,codecov
-    - python: 3.4
     - python: 3.5
     - python: 3.6
-      env: TOXENV=py,py36-lowest,codecov
     - python: 3.7
       env: TOXENV=py,py37-lowest,codecov
     - python: 3.7

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -3,6 +3,9 @@ Version 3.0.0
 
 Unreleased
 
+-   Drop support for Python 3.4.
+-   Bump minimum version of Flask to 1.0.4.
+-   Bump minimum version of SQLAlchemy to 1.2.
 -   Set `SQLALCHEMY_TRACK_MODIFICATIONS` to `False` by default,
     remove deprecation warning (:pr:`727`)
 

diff --git a/docs/index.rst b/docs/index.rst
@@ -26,7 +26,7 @@ Requirements
    :header: "Our Version", "Python", "Flask", "SQLAlchemy"
 
    "2.x", "2.7, 3.4+", 0.12+, "0.8+ or 1.0.10+ w/ Python 3.7"
-   "3.0+ (in dev)", "2.7, 3.5+", 1.0+, 1.0+
+   "3.0+ (in dev)", "2.7, 3.5+", 1.0.4+, 1.2+
 
 User Guide
 ----------

diff --git a/setup.py b/setup.py
@@ -27,8 +27,8 @@
     long_description=readme,
     packages=["flask_sqlalchemy"],
     include_package_data=True,
-    python_requires=">= 2.7, != 3.0.*, != 3.1.*, != 3.2.*, != 3.3.*",
-    install_requires=["Flask>=0.10", "SQLAlchemy>=0.8.0"],
+    python_requires=">= 2.7, != 3.0.*, != 3.1.*, != 3.2.*, != 3.3.*, !=3.4.*",
+    install_requires=["Flask>=1.0.4", "SQLAlchemy>=1.2"],
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Environment :: Web Environment",
@@ -39,7 +39,6 @@
         "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",

diff --git a/tox.ini b/tox.ini
@@ -1,9 +1,9 @@
 [tox]
 envlist =
     # All supported Python versions. If you update this, please update docs/index.rst.
-    py{37,36,35,34,27,py}
+    py{37,36,35,27,py}
     # Don't need to test all Python versions against lowest requirements.
-    py{37,36,27}-lowest
+    py{37,27}-lowest
     docs
     coverage-report
 # This will only apply on a dev machine. We set this false for CI.
@@ -15,10 +15,8 @@ deps =
     coverage
     blinker
     mock
-    py27-lowest,py36-lowest: flask==0.12
-    py27-lowest,py36-lowest: sqlalchemy==0.8
-    # This is the first version that works w/ Python 3.7
-    py37-lowest: sqlalchemy==1.0.10
+    lowest: flask==1.0.4
+    lowest: sqlalchemy==1.2
 commands = coverage run -p -m pytest --tb=short --basetemp={envtmpdir} {posargs}
 
 [testenv:docs]