more manual fixes, drop requirements.txt

freeze/tests/fakeserver.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 import json
 import multiprocessing
 from threading import Thread

shub/image/deploy.py

@@ -136,7 +136,7 @@ def show(self):
         super().show()
 
     def handle_event(self, event):
-        click.echo(f"{event}")
+        click.echo(event)
 
 
 class _DeployProgress(utils.BaseProgress):

shub/image/run/wrapper.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """
 A helper wrapper over start-crawl to run a custom image locally.
 

shub/image/test.py

@@ -4,8 +4,6 @@
 from shub.config import load_shub_config, list_targets_callback
 from shub.image import utils
 
-long = int
-
 SHORT_HELP = "Test a built image with Scrapy Cloud contract"
 HELP = """
 A command to test an image after build step to make sure it fits contract.
@@ -77,11 +75,11 @@ def _check_image_size(image_name, docker_client):
     from docker.errors import NotFound
     try:
         size = docker_client.inspect_image(image_name).get('Size')
-        if size and isinstance(size, (int, long)) and size > IMAGE_SIZE_LIMIT:
+        if size and isinstance(size, int) and size > IMAGE_SIZE_LIMIT:
             raise shub_exceptions.CustomImageTooLargeException(
                 IMAGE_TOO_LARGE_WARNING)
     except NotFound as exc:
-        utils.debug_log(f"{exc}")
+        utils.debug_log(exc)
         raise shub_exceptions.NotFoundException(
             "The image doesn't exist yet, please use build command at first.")
 

tests/test_deploy.py

@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-
-
 import os
 import sys
 import unittest
@@ -257,7 +254,7 @@ def test_egg_glob_pattern(self):
     def test_add_sources(self):
         convert_deps_to_pip = Mock(
             side_effect=[
-                './requirements.txt',
+                './tests/requirements.txt',
                 ['package==0.0.0', 'hash-package==0.0.1', 'hash-package2==0.0.1'],
             ],
         )

tests/test_deploy_egg.py

@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-
-
 import os
 import shutil
 import tempfile

tests/test_deploy_reqs.py

@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-
-
 import unittest
 import os
 import tempfile

tests/test_end_to_end.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import unittest
 from click.testing import CliRunner
 from shub import tool

tox.ini

@@ -13,13 +13,11 @@ commands =
 [testenv:min]
 deps =
     {[testenv]deps}
-    -r requirements.txt
 
 [testenv:freeze]
 install_command =
     python -m pip install {opts} {packages}
 deps =
-    -rrequirements.txt
     pyinstaller==4.10
     pytest
     packaging==20.4