fix: remove arbitrary equality comparisons (not supported by renovate) (GoogleCloudPlatform#12561)

* fix: update syntax for markupsafe deps

* update syntax for mock deps

* provide python3 versions of pytest, mock

* add six to samples that require it

* flake8

Author: glasnt

appengine/flexible/websockets/requirements.txt

@@ -2,5 +2,5 @@ Flask==1.1.4 # it seems like Flask-sockets doesn't play well with 2.0+
 Flask-Sockets==0.2.1
 gunicorn==22.0.0
 requests==2.31.0
-markupsafe===2.0.1
+markupsafe==2.0.1
 Werkzeug==1.0.1;

appengine/flexible_python37_and_earlier/websockets/requirements.txt

@@ -2,5 +2,5 @@ Flask==1.1.4 # it seems like Flask-sockets doesn't play well with 2.0+
 Flask-Sockets==0.2.1
 gunicorn==22.0.0
 requests==2.31.0
-markupsafe===2.0.1
+markupsafe==2.0.1
 Werkzeug==1.0.1;

appengine/standard/endpoints-frameworks-v2/echo/requirements-test.txt

@@ -1,3 +1,5 @@
 # pin pytest to 4.6.11 for Python2.
 pytest==4.6.11; python_version < '3.0'
-mock===3.0.5; python_version < '3.0'
+pytest==8.3.2; python_version >= '3.0'
+mock==3.0.5; python_version < '3.0'
+mock==5.1.0; python_version >= '3.0'

appengine/standard/endpoints-frameworks-v2/quickstart/requirements-test.txt

@@ -1,3 +1,5 @@
 # pin pytest to 4.6.11 for Python2.
 pytest==4.6.11; python_version < '3.0'
-mock===3.0.5; python_version < '3.0'
+pytest==8.3.2; python_version >= '3.0'
+mock==3.0.5; python_version < '3.0'
+mock==5.1.0; python_version >= '3.0'

appengine/standard/firebase/firenotes/backend/requirements-test.txt

@@ -1,3 +1,5 @@
 # pin pytest to 4.6.11 for Python2.
 pytest==4.6.11; python_version < '3.0'
-mock===3.0.5; python_version < '3.0'
+pytest==8.3.2; python_version >= '3.0'
+mock==3.0.5; python_version < '3.0'
+mock==5.1.0; python_version >= '3.0'

appengine/standard/firebase/firetactoe/firetactoe.py

@@ -20,21 +20,19 @@
     from functools import lru_cache
 except ImportError:
     from functools32 import lru_cache
+
 import json
 import os
 import re
 import time
 import urllib
 
-
 import flask
 from flask import request
-from google.appengine.api import app_identity
-from google.appengine.api import users
+from google.appengine.api import app_identity, users
 from google.appengine.ext import ndb
-from google.auth.transport.requests import AuthorizedSession
 import google.auth
-
+from google.auth.transport.requests import AuthorizedSession
 
 _FIREBASE_CONFIG = "_firebase_config.html"
 

appengine/standard/firebase/firetactoe/firetactoe_test.py

@@ -12,13 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import re
 
 from google.appengine.api import users
 from google.appengine.ext import ndb
-from six.moves import http_client
+import mock
 import pytest
+from six.moves import http_client
 import webtest
 
 import firetactoe

appengine/standard/firebase/firetactoe/requirements-test.txt

@@ -1,4 +1,6 @@
 # pin pytest to 4.6.11 for Python2.
 pytest==4.6.11; python_version < '3.0'
+pytest==8.3.2; python_version >= '3.0'
 WebTest==2.0.35; python_version < '3.0'
-mock===3.0.5; python_version < "3"
+mock==3.0.5; python_version < "3"
+mock==5.1.0; python_version >= '3.0'

appengine/standard/firebase/firetactoe/rest_api.py

@@ -21,8 +21,8 @@
 # [START rest_writing_data]
 import json
 
-from google.auth.transport.requests import AuthorizedSession
 import google.auth
+from google.auth.transport.requests import AuthorizedSession
 
 _FIREBASE_SCOPES = [
     "https://www.googleapis.com/auth/firebase.database",

appengine/standard/iap/main_test.py

@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import main
 import webtest
 
+import main
+
 
 def test_index(testbed, login):
     app = webtest.TestApp(main.app)