Bump aiohttp from 2.3.10 to 3.7.4 (#12)

* Bump aiohttp from 2.3.10 to 3.7.4

Bumps [aiohttp](https://github.com/aio-libs/aiohttp) from 2.3.10 to 3.7.4.
- [Release notes](https://github.com/aio-libs/aiohttp/releases)
- [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst)
- [Commits](aio-libs/aiohttp@v2.3.10...v3.7.4)
Signed-off-by: dependabot[bot] <support@github.com>
* bumping version, running black, testing new aiohttp
Signed-off-by: vsoch <vsoch@users.noreply.github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: vsoch <vsoch@users.noreply.github.com>

CHANGELOG.md

@@ -14,5 +14,6 @@ represented by the pull requests that fixed them. Critical items to know are:
 
 
 ## [v1.x](https://github.com/singularityhub/stools/tree/master) (master)
+ - bumping aiohttp version (0.0.13)
  - Adding generation of reports to folder with --reports (0.0.12)
  - Original release of stools, primarily will be used with the docker-compose.yml (0.0.1)

README.md

@@ -16,7 +16,7 @@ vulnerabilities.
 Note that after the first two releases, version numbers correspond with releases on pypi,
 and not Singularity versions.
 
- - [v0.0.12 (master)](https://github.com/singularityhub/stools) adds support for reports saving
+ - [v0.0.13 (master)](https://github.com/singularityhub/stools) adds support for reports saving
  - [v3.2.1](https://github.com/singularityhub/stools/tree/v3.2.1) Uses Singularity v3.2.1 and above
  - [v2.4.5](https://github.com/singularityhub/stools/tree/v2.4.5) Uses Singularity v2.4.5
 

requirements.txt

@@ -1,2 +1,2 @@
-aiohttp==2.3.10
+aiohttp==3.7.4
 requests>=2.20.0

setup.py

@@ -8,9 +8,9 @@
 
 
 def get_lookup():
-    """get version by way of stools.version, returns a 
-       lookup dictionary with several global variables without
-       needing to import singularity
+    """get version by way of stools.version, returns a
+    lookup dictionary with several global variables without
+    needing to import singularity
     """
     lookup = dict()
     version_file = os.path.join("stools", "version.py")
@@ -21,7 +21,7 @@ def get_lookup():
 
 def get_reqs(lookup=None, key="INSTALL_REQUIRES"):
     """get requirements, mean reading in requirements and versions from
-       the lookup obtained with get_lookup
+    the lookup obtained with get_lookup
     """
     if lookup == None:
         lookup = get_lookup()

stools/clair/__init__.py

@@ -2,7 +2,7 @@
 
 """
 
-Copyright (C) 2018-2020 Vanessa Sochat.
+Copyright (C) 2018-2021 Vanessa Sochat.
 
 This program is free software: you can redistribute it and/or modify it
 under the terms of the GNU Affero General Public License as published by
@@ -114,8 +114,8 @@ def main():
     parser = get_parser()
 
     def help(retval=0):
-        """print help, including the software version and active client 
-           and exit with return code.
+        """print help, including the software version and active client
+        and exit with return code.
         """
         version()
         parser.print_help()

stools/clair/api.py

@@ -1,6 +1,6 @@
 """
 
-Copyright (C) 2018-2020 Vanessa Sochat.
+Copyright (C) 2018-2021 Vanessa Sochat.
 
 This program is free software: you can redistribute it and/or modify it
 under the terms of the GNU Affero General Public License as published by
@@ -52,10 +52,10 @@ def scan(self, targz_url, name):
 
     def report(self, name):
         """generate a report for an image of interest. The name should
-           correspond to the same name used when adding the layer...
+        correspond to the same name used when adding the layer...
 
-           Parameters
-           ==========
+        Parameters
+        ==========
         """
 
         url = os.path.join(self.url, "layers", name)
@@ -68,13 +68,13 @@ def report(self, name):
 
     def ping(self):
         """ping serves as a health check. If healthy, will return True.
-           We do this because the user is starting Clair as
-           a separate (Docker) image and it might be the case that the
-           server port/host are not correctly set.
+        We do this because the user is starting Clair as
+        a separate (Docker) image and it might be the case that the
+        server port/host are not correctly set.
 
-           Returns
-           =======
-           healthy: If healthy, returns True, otherwise False
+        Returns
+        =======
+        healthy: If healthy, returns True, otherwise False
 
         """
         url = os.path.join(self.url, "namespaces")

stools/clair/image.py

@@ -1,6 +1,6 @@
 """
 
-Copyright (C) 2018-2020 Vanessa Sochat.
+Copyright (C) 2018-2021 Vanessa Sochat.
 
 This program is free software: you can redistribute it and/or modify it
 under the terms of the GNU Affero General Public License as published by
@@ -29,14 +29,14 @@
 
 def export_to_targz(image, tmpdir=None):
     """export a Singularity image to a .tar.gz file. If run within a docker
-       image, you should set via_build to false (as sudo will work under
-       priviledged). Outside of Docker as regular user, via_build works
-       better.
+    image, you should set via_build to false (as sudo will work under
+    priviledged). Outside of Docker as regular user, via_build works
+    better.
 
-       Parameters
-       ==========
-       image: the full path to the Singularity image
-       tmpdir: a temporary directory to export to.
+    Parameters
+    ==========
+    image: the full path to the Singularity image
+    tmpdir: a temporary directory to export to.
 
     """
     print("Exporting %s to targz..." % image)
@@ -62,7 +62,7 @@ def export_to_targz(image, tmpdir=None):
 
 def sha256(image, block_size=65536):
     """create a dummy Docker image name (the sha256 sum)
-       https://gist.github.com/rji/b38c7238128edf53a181
+    https://gist.github.com/rji/b38c7238128edf53a181
     """
     hashsum = hashlib.sha256()
     with open(image, "rb") as filey:

stools/clair/server/main.py

@@ -1,6 +1,6 @@
 """
 
-Copyright (C) 2018-2020 Vanessa Sochat.
+Copyright (C) 2018-2021 Vanessa Sochat.
 
 This program is free software: you can redistribute it and/or modify it
 under the terms of the GNU Affero General Public License as published by

stools/clair/server/routes.py

@@ -1,6 +1,6 @@
 """
 
-Copyright (C) 2018-2020 Vanessa Sochat.
+Copyright (C) 2018-2021 Vanessa Sochat.
 
 This program is free software: you can redistribute it and/or modify it
 under the terms of the GNU Affero General Public License as published by

stools/clair/server/views.py

@@ -1,6 +1,6 @@
 """
 
-Copyright (C) 2018-2020 Vanessa Sochat.
+Copyright (C) 2018-2021 Vanessa Sochat.
 
 This program is free software: you can redistribute it and/or modify it
 under the terms of the GNU Affero General Public License as published by

stools/utils.py

@@ -1,6 +1,6 @@
 """
 
-Copyright (C) 2018-2020 Vanessa Sochat.
+Copyright (C) 2018-2021 Vanessa Sochat.
 
 This program is free software: you can redistribute it and/or modify it
 under the terms of the GNU Affero General Public License as published by
@@ -23,14 +23,14 @@
 
 def get_temporary_name(tmpdir=None, prefix="stools", ext=""):
     """generate a named temporary file in some temporary directory.
-       This generates the name and not the actual file, it is up to the
-       calling function to generate the structure.
-
-       Parameters
-       ==========
-       tmpdir: the temporary directory to create the file
-       prefix: the prefix of the file.
-       ext: the extension of the file (default .tar.gz)
+    This generates the name and not the actual file, it is up to the
+    calling function to generate the structure.
+
+    Parameters
+    ==========
+    tmpdir: the temporary directory to create the file
+    prefix: the prefix of the file.
+    ext: the extension of the file (default .tar.gz)
 
     """
     if ext not in [None, ""]:

stools/version.py

@@ -1,6 +1,6 @@
 """
 
-Copyright (C) 2018-2020 Vanessa Sochat.
+Copyright (C) 2018-2021 Vanessa Sochat.
 
 This program is free software: you can redistribute it and/or modify it
 under the terms of the GNU Affero General Public License as published by
@@ -17,7 +17,7 @@
 
 """
 
-__version__ = "0.0.12"
+__version__ = "0.0.13"
 AUTHOR = "Vanessa Sochat"
 AUTHOR_EMAIL = "vsochat@stanford.edu"
 NAME = "stools"