Drop py35 (#190)

* Remove py3.5 "hacks" in tests/examples.
* Upgrade to f-strings (used flynt and pyupgrade to help automate)
* Use variable annotations
* Update docs re py3.6 now being minimal supported version.
* Use async generators/comprehensions in core code where beneficial
* Optimize `Model._init_from_db` to minimize calling to_python_value if we have guarantees that allow for it to be skipped.

.travis.yml

@@ -1,7 +1,6 @@
 language: python
 python:
   - 3.6
-  - 3.5
   - 3.7
 env:
   global:

CHANGELOG.rst

@@ -2,6 +2,20 @@
 
 Changelog
 =========
+0.14.0
+------
+.. warning::
+   **This release drops support of Python 3.5:**
+
+   Tortoise ORM now requires a minimum of CPython 3.6 or PyPy3.6-7.1
+
+New Features:
+^^^^^^^^^^^^^
+- Fetching records from the DB is now up to 25% faster.
+
+Bugfixes:
+^^^^^^^^^
+
 
 0.13.7
 ------

Makefile

@@ -1,5 +1,5 @@
 checkfiles = tortoise/ examples/ tests/ setup.py conftest.py
-black_opts = -l 100
+black_opts = -l 100 -t py36
 py_warn = PYTHONWARNINGS=default PYTHONASYNCIODEBUG=1 PYTHONDEBUG=x PYTHONDEVMODE=dev
 
 help:

README.rst

@@ -30,7 +30,7 @@ You can find docs at `ReadTheDocs <http://tortoise-orm.readthedocs.io/en/latest/
    Tortoise ORM is young project and breaking changes are to be expected.
    We keep a `Changelog <http://tortoise-orm.readthedocs.io/en/latest/CHANGELOG.html>`_ and it will have possible breakage clearly documented.
 
-Tortoise ORM is supported on CPython >= 3.5.3 for SQLite, MySQL and PostgreSQL, and PyPy3.6 >= 7.1 for SQLite and MySQL only.
+Tortoise ORM is supported on CPython >= 3.6 for SQLite, MySQL and PostgreSQL, and PyPy3.6 >= 7.1 for SQLite and MySQL only.
 
 Why was Tortoise ORM built?
 ---------------------------

docs/CONTRIBUTING.rst

@@ -81,7 +81,7 @@ As this is a value that is different for different people, we have settled on:
 * Model/QuerySet usage should be explicit and concise.
 * Keep it simple, as simple code not only often runs faster, but has less bugs too.
 * Correctness > Ease-Of-Use > Performance > Maintenance
-* Test everything. (Currently our test suite is not yet mature)
+* Test everything.
 * Only do performance/memory optimisation when you have a repeatable benchmark to measure with.
 
 
@@ -97,9 +97,8 @@ Tortoise ORM follows a the following agreed upon style:
 * Always try to separate out terms clearly rather than concatenate words directly:
     * ``some_purpose`` instead of ``somepurpose``
     * ``SomePurpose`` instead of ``Somepurpose``
-* Keep in mind the targeted Python versions of ``>=3.5.3``:
-    * Don't use f-strings
-    * Stick to comment-style variable type annotations
+* Keep in mind the targeted Python versions of ``>=3.6``:
+    * Do use f-strings
 * Please try and provide type annotations where you can, it will improve auto-completion in editors, and better static analysis.
 
 

docs/index.rst

@@ -13,7 +13,7 @@ It's engraved in it's design that you are working not with just tables, you work
 
 Source & issue trackers are available at `<https://github.com/tortoise/tortoise-orm/>`_
 
-Tortoise ORM is supported on CPython >= 3.5.3 for SQLite, MySQL and PostgreSQL, and PyPy3.5 >= 5.10 for SQLite and MySQL only.
+Tortoise ORM is supported on CPython >= 3.6 for SQLite, MySQL and PostgreSQL, and PyPy3.6 >= 7.1 for SQLite and MySQL only.
 
 Introduction
 ============

examples/aggregation.py

@@ -42,7 +42,7 @@ async def run():
     await event.save()
     participants = []
     for i in range(2):
-        team = Team(name="Team {}".format(i + 1))
+        team = Team(name=f"Team {(i + 1)}")
         await team.save()
         participants.append(team)
     await event.participants.add(participants[0], participants[1])

examples/quart/models.py

@@ -6,12 +6,12 @@ class Users(Model):
     status = fields.CharField(20)
 
     def __str__(self):
-        return "User {}: {}".format(self.id, self.status)
+        return f"User {self.id}: {self.status}"
 
 
 class Workers(Model):
     id = fields.IntField(pk=True)
     status = fields.CharField(20)
 
     def __str__(self):
-        return "Worker {}: {}".format(self.id, self.status)
+        return f"Worker {self.id}: {self.status}"

examples/relations.py

@@ -49,7 +49,7 @@ async def run():
     await event.save()
     participants = []
     for i in range(2):
-        team = Team(name="Team {}".format(i + 1))
+        team = Team(name=f"Team {(i + 1)}")
         await team.save()
         participants.append(team)
     await event.participants.add(participants[0], participants[1])

examples/relations_recursive.py

@@ -20,31 +20,31 @@ class Employee(Model):
     def __str__(self):
         return self.name
 
-    # async def full_hierarchy__async_for(self, level=0):
-    #     """
-    #     Demonstrates ``async for` to fetch relations
-    #
-    #     An async iterator will fetch the relationship on-demand.
-    #     """
-    #     text = [
-    #         "{}{} (to: {}) (from: {})".format(
-    #             level * "  ",
-    #             self,
-    #             ", ".join([str(val) async for val in self.talks_to]),
-    #             ", ".join([str(val) async for val in self.gets_talked_to]),
-    #         )
-    #     ]
-    #     async for member in self.team_members:
-    #         text.append(await member.full_hierarchy__async_for(level + 1))
-    #     return "\n".join(text)
+    async def full_hierarchy__async_for(self, level=0):
+        """
+        Demonstrates ``async for` to fetch relations
+
+        An async iterator will fetch the relationship on-demand.
+        """
+        text = [
+            "{}{} (to: {}) (from: {})".format(
+                level * "  ",
+                self,
+                ", ".join([str(val) async for val in self.talks_to]),
+                ", ".join([str(val) async for val in self.gets_talked_to]),
+            )
+        ]
+        async for member in self.team_members:
+            text.append(await member.full_hierarchy__async_for(level + 1))
+        return "\n".join(text)
 
     async def full_hierarchy__fetch_related(self, level=0):
         """
         Demonstrates ``await .fetch_related`` to fetch relations
 
         On prefetching the data, the relationship files will contain a regular list.
 
-        This is how one would get relations working on sync serialisation/templating frameworks.
+        This is how one would get relations working on sync serialization/templating frameworks.
         """
         await self.fetch_related("team_members", "talks_to", "gets_talked_to")
         text = [
@@ -78,14 +78,14 @@ async def run():
 
     # Evaluated off creation objects
     print(await loose.full_hierarchy__fetch_related())
-    # print(await root.full_hierarchy__async_for())
+    print(await root.full_hierarchy__async_for())
     print(await root.full_hierarchy__fetch_related())
 
     # Evaluated off new objects → Result is identical
     root2 = await Employee.get(name="Root")
     loose2 = await Employee.get(name="Loose")
     print(await loose2.full_hierarchy__fetch_related())
-    # print(await root2.full_hierarchy__async_for())
+    print(await root2.full_hierarchy__async_for())
     print(await root2.full_hierarchy__fetch_related())
 
 

examples/sanic/models.py

@@ -6,4 +6,4 @@ class Users(Model):
     name = fields.CharField(50)
 
     def __str__(self):
-        return "User {}: {}".format(self.id, self.name)
+        return f"User {self.id}: {self.name}"

examples/starlette/models.py

@@ -6,4 +6,4 @@ class Users(models.Model):
     username = fields.CharField(max_length=20)
 
     def __str__(self) -> str:
-        return "User {}: {}".format(self.id, self.username)
+        return f"User {self.id}: {self.username}"

setup.cfg

@@ -35,6 +35,7 @@ warn_unused_ignores = True
 warn_no_return = True
 warn_return_any = False
 warn_unused_configs = True
+warn_unreachable = True
 allow_redefinition = True
 strict_equality = True
 show_error_context = True
@@ -43,6 +44,7 @@ show_error_context = True
 check_untyped_defs = False
 disallow_untyped_defs = False
 disallow_incomplete_defs = False
+warn_unreachable = False
 
 [mypy-examples.*]
 check_untyped_defs = False

setup.py

@@ -1,15 +1,11 @@
 # coding: utf8
 import re
 import sys
-import warnings
 
 from setuptools import find_packages, setup
 
-if sys.version_info < (3, 5, 3):
-    raise RuntimeError("tortoise requires Python 3.5.3+")
-
 if sys.version_info < (3, 6):
-    warnings.warn("Tortoise-ORM is soon going to require Python 3.6", DeprecationWarning)
+    raise RuntimeError("Tortoise-ORM requires Python >= 3.6")
 
 
 def version() -> str:
@@ -51,7 +47,6 @@ def requirements() -> list:
         "Development Status :: 3 - Alpha",
         "Intended Audience :: Developers",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: Implementation :: CPython",

tests/requirements.in

@@ -43,10 +43,7 @@ hypercorn;python_version>="3.7"
 quart;python_version>="3.7"
 
 # Sample integration - Sanic
-httpcore;python_version>="3.6"
-sanic;python_version>="3.6"
-requests-async;python_version>="3.6"
+sanic
 
 # Sample integration - Starlette
-uvicorn==0.8.6; python_version>="3.6"
-starlette;python_version>="3.6"
+starlette

tests/requirements.txt

@@ -26,7 +26,7 @@ certifi==2019.9.11        # via httpcore, requests
 cffi==1.12.3              # via cryptography
 chardet==3.0.4            # via httpcore, requests
 ciso8601==2.1.1
-click==7.0                # via black, pip-tools, quart, uvicorn
+click==7.0                # via black, pip-tools, quart
 cloud-sptheme==1.9.4
 colorama==0.4.1           # via green
 coverage==4.5.4           # via coveralls, green, nose2, pytest-cov
@@ -42,11 +42,11 @@ flake8==3.7.8             # via flake8-isort
 gitdb2==2.0.5             # via gitpython
 gitpython==3.0.2          # via bandit
 green==3.0.0
-h11==0.8.1                # via httpcore, hypercorn, uvicorn, wsproto
+h11==0.8.1                # via httpcore, hypercorn, wsproto
 h2==3.1.1                 # via httpcore, hypercorn
 hpack==3.0.0              # via h2
-httpcore==0.3.0 ; python_version >= "3.6"
-httptools==0.0.13         # via sanic, uvicorn
+httpcore==0.3.0           # via requests-async
+httptools==0.0.13         # via sanic
 hypercorn==0.8.2 ; python_version >= "3.7"
 hyperframe==5.2.0         # via h2
 idna==2.8                 # via httpcore, requests
@@ -87,19 +87,19 @@ pytz==2019.2              # via babel
 pyyaml==5.1.2
 quart==0.10.0 ; python_version >= "3.7"
 readme-renderer==24.0     # via twine
-requests-async==0.5.0 ; python_version >= "3.6"
+requests-async==0.5.0     # via sanic
 requests-toolbelt==0.9.1  # via twine
 requests==2.22.0          # via coveralls, requests-async, requests-toolbelt, sphinx, twine
 rfc3986==1.3.2            # via httpcore
-sanic==19.6.3 ; python_version >= "3.6"
+sanic==19.6.3
 six==1.12.0               # via astroid, bandit, bleach, cryptography, nose2, packaging, pip-tools, pytest-xdist, readme-renderer, sphinx, stevedore, tox
 smmap2==2.0.5             # via gitdb2
 snowballstemmer==1.9.1    # via sphinx
 sortedcontainers==2.1.0   # via quart
 sphinx-autodoc-typehints==1.6.0
 sphinx==1.8.5
 sphinxcontrib-websupport==1.1.2  # via sphinx
-starlette==0.12.9 ; python_version >= "3.6"
+starlette==0.12.9
 stevedore==1.31.0         # via bandit
 testfixtures==6.10.0      # via flake8-isort
 toml==0.10.0              # via black, hypercorn, tox
@@ -111,12 +111,11 @@ typing-extensions==3.7.4  # via hypercorn, mypy
 ujson==1.35               # via sanic
 unidecode==1.1.1          # via green
 urllib3==1.25.5           # via requests
-uvicorn==0.8.6 ; python_version >= "3.6"
-uvloop==0.12.2            # via sanic, uvicorn
+uvloop==0.13.0            # via sanic
 virtualenv==16.7.5        # via tox
 wcwidth==0.1.7            # via pytest
 webencodings==0.5.1       # via bleach
-websockets==7.0           # via sanic, uvicorn
+websockets==7.0           # via sanic
 wrapt==1.11.2             # via astroid
 wsproto==0.15.0 ; python_version >= "3.7"
 zipp==0.6.0               # via importlib-metadata

tests/test_aggregation.py

@@ -14,7 +14,7 @@ async def test_aggregation(self):
         await event.save()
         participants = []
         for i in range(2):
-            team = Team(name="Team {}".format(i + 1))
+            team = Team(name=f"Team {(i + 1)}")
             await team.save()
             participants.append(team)
         await event.participants.add(participants[0], participants[1])

tests/test_describe_model.py

@@ -1,5 +1,4 @@
 import json
-import sys
 import uuid
 
 from tests.testmodels import (
@@ -41,7 +40,6 @@ async def test_describe_models_some(self):
             {"models.Event", "models.Tournament", "models.Reporter", "models.Team"}, set(val.keys())
         )
 
-    @test.skipIf(sys.version_info < (3, 6), "Dict not sorted in 3.5")
     async def test_describe_model_straight(self):
         val = Tortoise.describe_model(StraightFields)
 
@@ -158,7 +156,6 @@ async def test_describe_model_straight(self):
             },
         )
 
-    @test.skipIf(sys.version_info < (3, 6), "Dict not sorted in 3.5")
     async def test_describe_model_straight_native(self):
         val = Tortoise.describe_model(StraightFields, serializable=False)
 
@@ -275,7 +272,6 @@ async def test_describe_model_straight_native(self):
             },
         )
 
-    @test.skipIf(sys.version_info < (3, 6), "Dict not sorted in 3.5")
     async def test_describe_model_source(self):
         val = Tortoise.describe_model(SourceFields)
 
@@ -392,7 +388,6 @@ async def test_describe_model_source(self):
             },
         )
 
-    @test.skipIf(sys.version_info < (3, 6), "Dict not sorted in 3.5")
     async def test_describe_model_source_native(self):
         val = Tortoise.describe_model(SourceFields, serializable=False)
 
@@ -509,7 +504,6 @@ async def test_describe_model_source_native(self):
             },
         )
 
-    @test.skipIf(sys.version_info < (3, 6), "Dict not sorted in 3.5")
     async def test_describe_model_uuidpk(self):
         val = Tortoise.describe_model(UUIDPkModel)
 
@@ -576,7 +570,6 @@ async def test_describe_model_uuidpk(self):
             },
         )
 
-    @test.skipIf(sys.version_info < (3, 6), "Dict not sorted in 3.5")
     async def test_describe_model_uuidpk_native(self):
         val = Tortoise.describe_model(UUIDPkModel, serializable=False)
 
@@ -643,7 +636,6 @@ async def test_describe_model_uuidpk_native(self):
             },
         )
 
-    @test.skipIf(sys.version_info < (3, 6), "Dict not sorted in 3.5")
     async def test_describe_model_json(self):
         val = Tortoise.describe_model(JSONFields)
 
@@ -712,7 +704,6 @@ async def test_describe_model_json(self):
             },
         )
 
-    @test.skipIf(sys.version_info < (3, 6), "Dict not sorted in 3.5")
     async def test_describe_model_json_native(self):
         val = Tortoise.describe_model(JSONFields, serializable=False)