Add support for Python 3.9

kura · Jul 3, 2021 · 728cba1 · 728cba1
1 parent de5a2b0
commit 728cba1
Show file tree

Hide file tree

Showing 68 changed files with 1,572 additions and 990 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -43,13 +43,27 @@ matrix:
       - popd
     script: tox
 
-  - python: "pypy3"
-    env: TOXENV=pypy3,pypy3-setproctitle
+  - python: "3.9"
+    env: TOXENV=py39,py39-setproctitle,py39-uvloop
+    sudo: true
+    before_install:
+      - git clone https://github.com/libuv/libuv.git
+      - pushd libuv/
+      - git checkout $(git describe --tags)
+      - sh autogen.sh
+      - "./configure"
+      - make
+      - sudo make install
+      - popd
     script: tox
 
-  - python: "3.8"
+  - python: "pypy3.7-7.3.5"
+    env: TOXENV=pypy3,pypy3-setproctitle,pypy3-uvloop
+    script: tox
+
+  - python: "3.9"
     env: TOXENV=lint
-  - python: "3.8"
+  - python: "3.9"
     env: TOXENV=docs
     deploy:
       provider: pages
@@ -59,15 +73,15 @@ matrix:
       local_dir: .tox/docs/tmp/html
       on:
         branch: master
-  - python: "3.8"
+  - python: "3.9"
     env: TOXENV=build
-  - python: "3.8"
+  - python: "3.9"
     env: TOXENV=man
-  - python: "3.8"
+  - python: "3.9"
     env: TOXENV=poetry
-  - python: "3.8"
+  - python: "3.9"
     env: TOXENV=setuppy
-  - python: '3.8'
+  - python: '3.9'
     env: TOXENV=shellcheck
     addons:
       apt:

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -25,18 +25,26 @@ the functionality yourself.
 Current release
 ---------------
 
-.. _2.1.15:
+.. _2.1.16:
 
-2.1.15
+2.1.16
 ======
 
-- Blackhole now officially supports Python 3.8 and PyPy3. There are issues
-  using blackhole with uvloop on PyPy3 so that usecase is not supported.
+- Blackhole now officially supports Python 3.9.
+- Blackhole no longer supports Python 3.6.
 
 -------------
 Past releases
 -------------
 
+.. _2.1.15:
+
+2.1.15
+======
+
+- Blackhole now officially supports Python 3.8 and PyPy3. There are issues
+  using blackhole with uvloop on PyPy3 so that usecase is not supported.
+
 .. _2.1.13:
 
 2.1.13

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2013-2020 Kura
+Copyright (c) 2013-2021 Kura
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the 'Software'), to deal

diff --git a/blackhole/__init__.py b/blackhole/__init__.py
@@ -2,7 +2,7 @@
 
 # (The MIT License)
 #
-# Copyright (c) 2013-2020 Kura
+# Copyright (c) 2013-2021 Kura
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -52,7 +52,7 @@
 __copyright__ = "None"
 __credits__ = ("Kura",)
 __license__ = "MIT"
-__version__ = "2.1.15"
+__version__ = "2.1.16"
 __maintainer__ = "Kura"
 __email__ = "[email protected]"
 __status__ = "Stable"

diff --git a/blackhole/__main__.py b/blackhole/__main__.py
@@ -2,7 +2,7 @@
 
 # (The MIT License)
 #
-# Copyright (c) 2013-2020 Kura
+# Copyright (c) 2013-2021 Kura
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

diff --git a/blackhole/application.py b/blackhole/application.py
@@ -2,7 +2,7 @@
 
 # (The MIT License)
 #
-# Copyright (c) 2013-2020 Kura
+# Copyright (c) 2013-2021 Kura
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

diff --git a/blackhole/child.py b/blackhole/child.py
@@ -2,7 +2,7 @@
 
 # (The MIT License)
 #
-# Copyright (c) 2013-2020 Kura
+# Copyright (c) 2013-2021 Kura
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -109,7 +109,7 @@ def stop(self, *args, **kwargs):
             server.close()
         self.heartbeat_task.cancel()
         self.server_task.cancel()
-        for task in asyncio.Task.all_tasks(self.loop):
+        for task in asyncio.all_tasks(self.loop):
             task.cancel()
         self.loop.stop()
         self._started = False

diff --git a/blackhole/config.py b/blackhole/config.py
@@ -2,7 +2,7 @@
 
 # (The MIT License)
 #
-# Copyright (c) 2013-2020 Kura
+# Copyright (c) 2013-2021 Kura
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

diff --git a/blackhole/control.py b/blackhole/control.py
@@ -2,7 +2,7 @@
 
 # (The MIT License)
 #
-# Copyright (c) 2013-2020 Kura
+# Copyright (c) 2013-2021 Kura
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

diff --git a/blackhole/daemon.py b/blackhole/daemon.py
@@ -2,7 +2,7 @@
 
 # (The MIT License)
 #
-# Copyright (c) 2013-2020 Kura
+# Copyright (c) 2013-2021 Kura
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

diff --git a/blackhole/exceptions.py b/blackhole/exceptions.py
@@ -2,7 +2,7 @@
 
 # (The MIT License)
 #
-# Copyright (c) 2013-2020 Kura
+# Copyright (c) 2013-2021 Kura
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

diff --git a/blackhole/logs.py b/blackhole/logs.py
@@ -2,7 +2,7 @@
 
 # (The MIT License)
 #
-# Copyright (c) 2013-2020 Kura
+# Copyright (c) 2013-2021 Kura
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

diff --git a/blackhole/protocols.py b/blackhole/protocols.py
@@ -2,7 +2,7 @@
 
 # (The MIT License)
 #
-# Copyright (c) 2013-2020 Kura
+# Copyright (c) 2013-2021 Kura
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -133,7 +133,6 @@ async def wait(self):
                 line = await asyncio.wait_for(
                     self._reader.readline(),
                     self.config.timeout,
-                    loop=self.loop,
                 )
             except asyncio.TimeoutError:
                 await self.timeout()

diff --git a/blackhole/smtp.py b/blackhole/smtp.py
@@ -2,7 +2,7 @@
 
 # (The MIT License)
 #
-# Copyright (c) 2013-2020 Kura
+# Copyright (c) 2013-2021 Kura
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

diff --git a/blackhole/streams.py b/blackhole/streams.py
@@ -2,7 +2,7 @@
 
 # (The MIT License)
 #
-# Copyright (c) 2013-2020 Kura
+# Copyright (c) 2013-2021 Kura
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

diff --git a/blackhole/supervisor.py b/blackhole/supervisor.py
@@ -2,7 +2,7 @@
 
 # (The MIT License)
 #
-# Copyright (c) 2013-2020 Kura
+# Copyright (c) 2013-2021 Kura
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

diff --git a/blackhole/utils.py b/blackhole/utils.py
@@ -2,7 +2,7 @@
 
 # (The MIT License)
 #
-# Copyright (c) 2013-2020 Kura
+# Copyright (c) 2013-2021 Kura
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

diff --git a/blackhole/worker.py b/blackhole/worker.py
@@ -2,7 +2,7 @@
 
 # (The MIT License)
 #
-# Copyright (c) 2013-2020 Kura
+# Copyright (c) 2013-2021 Kura
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

diff --git a/docs/source/_extra/testssl.sh.html b/docs/source/_extra/testssl.sh.html
@@ -1,7 +1,7 @@
 <!--.
 (The MIT License)
 
-Copyright (c) 2013-2020 Kura
+Copyright (c) 2013-2021 Kura
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the 'Software'), to deal

diff --git a/docs/source/_static/blackhole.css b/docs/source/_static/blackhole.css
@@ -1,7 +1,7 @@
 */
 (The MIT License)
 
-Copyright (c) 2013-2020 Kura
+Copyright (c) 2013-2021 Kura
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the 'Software'), to deal

diff --git a/docs/source/api-application.rst b/docs/source/api-application.rst
@@ -1,7 +1,7 @@
 ..
     # (The MIT License)
     #
-    # Copyright (c) 2013-2020 Kura
+    # Copyright (c) 2013-2021 Kura
     #
     # Permission is hereby granted, free of charge, to any person obtaining a
     # copy of this software and associated documentation files (the

diff --git a/docs/source/api-child.rst b/docs/source/api-child.rst
@@ -1,7 +1,7 @@
 ..
     # (The MIT License)
     #
-    # Copyright (c) 2013-2020 Kura
+    # Copyright (c) 2013-2021 Kura
     #
     # Permission is hereby granted, free of charge, to any person obtaining a
     # copy of this software and associated documentation files (the

diff --git a/docs/source/api-config.rst b/docs/source/api-config.rst
@@ -1,7 +1,7 @@
 ..
     # (The MIT License)
     #
-    # Copyright (c) 2013-2020 Kura
+    # Copyright (c) 2013-2021 Kura
     #
     # Permission is hereby granted, free of charge, to any person obtaining a
     # copy of this software and associated documentation files (the

diff --git a/docs/source/api-control.rst b/docs/source/api-control.rst
@@ -1,7 +1,7 @@
 ..
     # (The MIT License)
     #
-    # Copyright (c) 2013-2020 Kura
+    # Copyright (c) 2013-2021 Kura
     #
     # Permission is hereby granted, free of charge, to any person obtaining a
     # copy of this software and associated documentation files (the

diff --git a/docs/source/api-daemon.rst b/docs/source/api-daemon.rst
@@ -1,7 +1,7 @@
 ..
     # (The MIT License)
     #
-    # Copyright (c) 2013-2020 Kura
+    # Copyright (c) 2013-2021 Kura
     #
     # Permission is hereby granted, free of charge, to any person obtaining a
     # copy of this software and associated documentation files (the

diff --git a/docs/source/api-exceptions.rst b/docs/source/api-exceptions.rst
@@ -1,7 +1,7 @@
 ..
     # (The MIT License)
     #
-    # Copyright (c) 2013-2020 Kura
+    # Copyright (c) 2013-2021 Kura
     #
     # Permission is hereby granted, free of charge, to any person obtaining a
     # copy of this software and associated documentation files (the

diff --git a/docs/source/api-logs.rst b/docs/source/api-logs.rst
@@ -1,7 +1,7 @@
 ..
     # (The MIT License)
     #
-    # Copyright (c) 2013-2020 Kura
+    # Copyright (c) 2013-2021 Kura
     #
     # Permission is hereby granted, free of charge, to any person obtaining a
     # copy of this software and associated documentation files (the

diff --git a/docs/source/api-protocols.rst b/docs/source/api-protocols.rst
@@ -1,7 +1,7 @@
 ..
     # (The MIT License)
     #
-    # Copyright (c) 2013-2020 Kura
+    # Copyright (c) 2013-2021 Kura
     #
     # Permission is hereby granted, free of charge, to any person obtaining a
     # copy of this software and associated documentation files (the

diff --git a/docs/source/api-smtp.rst b/docs/source/api-smtp.rst
@@ -1,7 +1,7 @@
 ..
     # (The MIT License)
     #
-    # Copyright (c) 2013-2020 Kura
+    # Copyright (c) 2013-2021 Kura
     #
     # Permission is hereby granted, free of charge, to any person obtaining a
     # copy of this software and associated documentation files (the

diff --git a/docs/source/api-streams.rst b/docs/source/api-streams.rst
@@ -1,7 +1,7 @@
 ..
     # (The MIT License)
     #
-    # Copyright (c) 2013-2020 Kura
+    # Copyright (c) 2013-2021 Kura
     #
     # Permission is hereby granted, free of charge, to any person obtaining a
     # copy of this software and associated documentation files (the

diff --git a/docs/source/api-supervisor.rst b/docs/source/api-supervisor.rst
@@ -1,7 +1,7 @@
 ..
     # (The MIT License)
     #
-    # Copyright (c) 2013-2020 Kura
+    # Copyright (c) 2013-2021 Kura
     #
     # Permission is hereby granted, free of charge, to any person obtaining a
     # copy of this software and associated documentation files (the

diff --git a/docs/source/api-utils.rst b/docs/source/api-utils.rst
@@ -1,7 +1,7 @@
 ..
     # (The MIT License)
     #
-    # Copyright (c) 2013-2020 Kura
+    # Copyright (c) 2013-2021 Kura
     #
     # Permission is hereby granted, free of charge, to any person obtaining a
     # copy of this software and associated documentation files (the

diff --git a/docs/source/api-worker.rst b/docs/source/api-worker.rst
@@ -1,7 +1,7 @@
 ..
     # (The MIT License)
     #
-    # Copyright (c) 2013-2020 Kura
+    # Copyright (c) 2013-2021 Kura
     #
     # Permission is hereby granted, free of charge, to any person obtaining a
     # copy of this software and associated documentation files (the

diff --git a/docs/source/api.rst b/docs/source/api.rst
@@ -1,7 +1,7 @@
 ..
     # (The MIT License)
     #
-    # Copyright (c) 2013-2020 Kura
+    # Copyright (c) 2013-2021 Kura
     #
     # Permission is hereby granted, free of charge, to any person obtaining a
     # copy of this software and associated documentation files (the

diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst