remove Python 3.5 from support (it's EOL). attempt to fix pypy3 travis test issue again.

Author: irmen

.travis.yml

@@ -1,7 +1,6 @@
 # travis CI config
 language: python
 python:
-  - 3.5
   - 3.6
   - 3.7
   - 3.8

Readme.rst

@@ -47,7 +47,7 @@ New code should use Pyro5 if at all possible.
 Features
 --------
 
-- written in 100% Python so extremely portable, runs on Python 3.5 and newer, and Pypy3
+- written in 100% Python so extremely portable, supported on Python 3.6 and newer, and Pypy3
 - works between different system architectures and operating systems.
 - able to communicate between different Python versions transparently.
 - defaults to a safe serializer (`serpent <https://pypi.python.org/pypi/serpent>`_) that supports many Python data types.

docs/source/changelog.rst

@@ -5,6 +5,7 @@ Change Log
 **Pyro 5.12**
 
 - fixed error when import Pyro5.server   (workaround was to import Pyro5.core before it)
+- removed Python 3.5 from the support list (it is EOL). Now requires Python 3.6 or newer
 
 
 **Pyro 5.11**

docs/source/install.rst

@@ -12,7 +12,7 @@ This chapter will show how to obtain and install Pyro.
 Compatibility
 -------------
 Pyro is written in 100% Python. It works on any recent operating system where a suitable
-supported Python implementation is available (3.5 or newer).
+supported Python implementation is available (3.6 or newer).
 
 
 .. index::

docs/source/intro.rst

@@ -23,7 +23,7 @@ Pyro is a pure Python library and runs on many different platforms and Python ve
 
 Here's a quick overview of Pyro's features:
 
-- written in 100% Python so extremely portable, runs on Python 3.5 and newer, and Pypy3
+- written in 100% Python so extremely portable, runs on Python 3.6 and newer, and Pypy3
 - works between different system architectures and operating systems.
 - able to communicate between different Python versions transparently.
 - defaults to a safe serializer (`serpent <https://pypi.python.org/pypi/serpent>`_) that supports many Python data types.
@@ -100,7 +100,7 @@ Using it should be very familiar to current Pyro4 users, however Pyro5 is not co
 To allow graceful upgrading, both versions can co-exist due to the new package name
 (the same happened years ago when Pyro 3 was upgraded to Pyro4).
 
-Pyro5 requires Python 3.5 or newer. If you're using an onder version of Python, you'll have to stick to Pyro4.
+Pyro5 requires Python 3.6 or newer. If you're using an onder version of Python, you'll have to stick to Pyro4.
 
 Pyro5 provides a basic backward-compatibility module so much of existing Pyro4 code doesn't have to
 change (apart from adding a single import statement).
@@ -121,7 +121,7 @@ What has been changed since Pyro4
 
 If you're familiar with Pyro4, most of the things are the same in Pyro5. These are the changes though:
 
-- Requires Python 3.5 or newer.
+- Requires Python 3.6 or newer.
 - the Pyro5 API is redesigned and this library is not compatible with Pyro4 code (although everything should be familiar):
 
       - Pyro5 is the new package name

setup.cfg

@@ -18,7 +18,6 @@ classifiers =
     Natural Language :: Dutch
     Operating System :: OS Independent
     Programming Language :: Python
-    Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8

setup.py

@@ -1,7 +1,4 @@
 import sys
 from setuptools import setup
 
-if sys.version_info < (3, 5):
-    raise SystemExit("Pyro5 requires Python 3.5 or newer")
-
 setup()

tests/test_naming.py

@@ -255,12 +255,19 @@ def setup_method(self):
         self.storageProvider = Pyro5.nameserver.MemoryStorage()
 
     def teardown_method(self):
-        self.storageProvider.clear()
+        self.clearStorage()
+        self.clearStorage()
         self.storageProvider.close()
 
+    def clearStorage(self):
+        try:
+            self.storageProvider.clear()
+        except AttributeError:
+            pass   # workaround for weird pypy3 issue on Travis
+
     def testRegister(self):
         ns = Pyro5.nameserver.NameServer(storageProvider=self.storageProvider)
-        self.storageProvider.clear()
+        self.clearStorage()
         ns.ping()
         ns.register("test.object1", "PYRO:[email protected]:4444")
         ns.register("test.object2", "PYRO:[email protected]:4444")
@@ -299,7 +306,7 @@ def testRegister(self):
 
     def testRemove(self):
         ns = Pyro5.nameserver.NameServer(storageProvider=self.storageProvider)
-        self.storageProvider.clear()
+        self.clearStorage()
         ns.register(Pyro5.core.NAMESERVER_NAME, "PYRO:nameserver@host:555")
         for i in range(20):
             ns.register("test.%d" % i, "PYRO:obj@host:555")
@@ -316,7 +323,7 @@ def testRemove(self):
 
     def testRemoveProtected(self):
         ns = Pyro5.nameserver.NameServer(storageProvider=self.storageProvider)
-        self.storageProvider.clear()
+        self.clearStorage()
         ns.register(Pyro5.core.NAMESERVER_NAME, "PYRO:nameserver@host:555")
         assert ns.remove(Pyro5.core.NAMESERVER_NAME) == 0
         assert ns.remove(prefix="Pyro") == 0
@@ -326,7 +333,7 @@ def testRemoveProtected(self):
 
     def testUnicodeNames(self):
         ns = Pyro5.nameserver.NameServer(storageProvider=self.storageProvider)
-        self.storageProvider.clear()
+        self.clearStorage()
         uri = Pyro5.core.URI("PYRO:unicode" + chr(0x20ac) + "@host:5555")
         ns.register("unicodename" + chr(0x20ac), uri)
         x = ns.lookup("unicodename" + chr(0x20ac))
@@ -335,7 +342,7 @@ def testUnicodeNames(self):
 
     def testList(self):
         ns = Pyro5.nameserver.NameServer(storageProvider=self.storageProvider)
-        self.storageProvider.clear()
+        self.clearStorage()
         ns.register("test.objects.1", "PYRONAME:something1")
         ns.register("test.objects.2", "PYRONAME:something2")
         ns.register("test.objects.3", "PYRONAME:something3")
@@ -490,7 +497,7 @@ def testMetadataLookupInvalidTypes(self):
             ns.yplookup(meta_any="string")
 
     def testMetadata(self):
-        self.storageProvider.clear()
+        self.clearStorage()
         ns = Pyro5.nameserver.NameServer(storageProvider=self.storageProvider)
         # register some names with metadata, and perform simple lookups
         ns.register("meta1", "PYRO:meta1@localhost:1111", metadata={"a", "b", "c"})
@@ -560,7 +567,7 @@ def testMetadata(self):
         assert ns.count() == 1
 
     def testMetadataAny(self):
-        self.storageProvider.clear()
+        self.clearStorage()
         ns = Pyro5.nameserver.NameServer(storageProvider=self.storageProvider)
         # register some names with metadata, and perform simple lookups
         ns.register("meta1", "PYRO:meta1@localhost:1111", metadata={"a", "b", "c"})
@@ -577,7 +584,7 @@ def testMetadataAny(self):
         assert "meta2" in result
 
     def testEmptyMetadata(self):
-        self.storageProvider.clear()
+        self.clearStorage()
         ns = Pyro5.nameserver.NameServer(storageProvider=self.storageProvider)
         # register some names with metadata, and perform simple lookups
         ns.register("meta1", "PYRO:meta1@localhost:1111", metadata=set())

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist=py35,py36,py37,py38,py39,pypy3
+envlist=py36,py37,py38,py39,pypy3
 
 [testenv]
 deps=