diff --git a/requirements/dev_lock.txt b/requirements/dev_lock.txt index 69f32d0cca..256e6f0e4a 100644 --- a/requirements/dev_lock.txt +++ b/requirements/dev_lock.txt @@ -77,11 +77,11 @@ jmespath==0.9.3 # via boto3, botocore jsonpickle==0.9.5 # via aws-xray-sdk lxml==4.1.0 markdown-include==0.5.1 -markdown==2.6.9 +markdown==2.6.9 # via markdown-include markupsafe==1.0 mock==2.0.0 moto==1.1.24 -mypy==0.530 +mypy==0.540 mypy_extensions==0.3.0 ndg-httpsclient==0.4.3 oauth2client==4.1.2 diff --git a/requirements/mypy.txt b/requirements/mypy.txt index bcf297f81b..f64811ab23 100644 --- a/requirements/mypy.txt +++ b/requirements/mypy.txt @@ -1,4 +1,4 @@ # After editing this file, you MUST afterward run # /tools/update-locked-requirements to update requirements/dev_lock.txt. # See requirements/README.md for more detail. -mypy==0.530 +mypy==0.540 diff --git a/requirements/prod_lock.txt b/requirements/prod_lock.txt index 2cc66590b9..5ecf417312 100644 --- a/requirements/prod_lock.txt +++ b/requirements/prod_lock.txt @@ -53,7 +53,7 @@ jedi==0.10.2 # via ipython jinja2==2.9.6 lxml==4.1.0 markdown-include==0.5.1 -markdown==2.6.9 +markdown==2.6.9 # via markdown-include markupsafe==1.0 mock==2.0.0 mypy_extensions==0.3.0 @@ -76,7 +76,7 @@ pyasn1-modules==0.1.5 pyasn1==0.3.7 pycparser==2.18 # via cffi pycrypto==2.6.1 -pygments==2.2.0 +pygments==2.2.0 # via ipython pyjwt==1.5.3 pyldap==2.4.37 pylibmc==1.5.2 diff --git a/version.py b/version.py index ab83054a25..d53fa78166 100644 --- a/version.py +++ b/version.py @@ -1,2 +1,2 @@ ZULIP_VERSION = "1.7.0+git" -PROVISION_VERSION = '10.9' +PROVISION_VERSION = '11.0' diff --git a/zerver/lib/test_runner.py b/zerver/lib/test_runner.py index d7ed023f49..9e59a4e068 100644 --- a/zerver/lib/test_runner.py +++ b/zerver/lib/test_runner.py @@ -238,7 +238,7 @@ def process_instrumented_calls(func): for call in test_helpers.INSTRUMENTED_CALLS: func(call) -SerializedSubsuite = Tuple[Type[Iterable[TestCase]], List[str]] +SerializedSubsuite = Tuple[Type['TestSuite'], List[str]] SubsuiteArgs = Tuple[Type['RemoteTestRunner'], int, SerializedSubsuite, bool] def run_subsuite(args): @@ -514,9 +514,9 @@ def serialize_suite(suite): return type(suite), get_test_names(suite) def deserialize_suite(args): - # type: (Tuple[Type[Iterable[TestCase]], List[str]]) -> Iterable[TestCase] + # type: (Tuple[Type[TestSuite], List[str]]) -> TestSuite suite_class, test_names = args - suite = suite_class() # type: ignore # Gives abstract type error. + suite = suite_class() tests = TestLoader().loadTestsFromNames(test_names) for test in get_tests_from_suite(tests): suite.addTest(test)