Merge pull request #116 from mtelka/no-python-35

Remove dependency on python 3.5

src/Makefile.com

@@ -20,7 +20,7 @@ CPPFLAGS = -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
 PYTHON_VERSION = 3.9
 
 # The full set of versions for which modules are delivered
-PYTHON_VERSIONS = 3.5 3.9
+PYTHON_VERSIONS = 3.9
 
 PEP8 = /usr/bin/pep8-$(PYTHON_VERSION)
 PYTHON = /usr/bin/python$(PYTHON_VERSION)

src/pkg/Makefile

@@ -93,7 +93,7 @@ PUBLIFESTS        = $(MANIFESTS:%.p5m=$(PDIR)/%.pub)
 DEPENDED          = $(MANIFESTS:%.p5m=$(PDIR)/%.dep)
 INCORP            = consolidation\:ips\:ips-incorporation
 
-PM_TRANSFORMS     = defaults py39
+PM_TRANSFORMS     = defaults
 
 i386_DEFINES      = \
 	i386_ONLY=''    \

src/pkg/external_deps.txt

@@ -7,45 +7,27 @@
     pkg:/developer/python/pylint
     pkg:/developer/versioning/mercurial
     pkg:/library/python/cffi
-    pkg:/library/python/cffi-35
     pkg:/library/python/cffi-39
-    pkg:/library/python/cherrypy-35
     pkg:/library/python/cherrypy-39
-    pkg:/library/python/coverage-35
     pkg:/library/python/coverage-39
-    pkg:/library/python/cryptography-35
     pkg:/library/python/cryptography-39
-    pkg:/library/python/jsonrpclib-35
     pkg:/library/python/jsonrpclib-39
-    pkg:/library/python/jsonschema-35
     pkg:/library/python/jsonschema-39
-    pkg:/library/python/mako-35
     pkg:/library/python/mako-39
-    pkg:/library/python/pycodestyle-35
     pkg:/library/python/pycodestyle-39
-    pkg:/library/python/ply-35
     pkg:/library/python/ply-39
-    pkg:/library/python/portend-35
     pkg:/library/python/portend-39
     pkg:/library/python/prettytable
-    pkg:/library/python/prettytable-35
     pkg:/library/python/prettytable-39
-    pkg:/library/python/pybonjour-35
     pkg:/library/python/pybonjour-39
-    pkg:/library/python/pycurl-35
     pkg:/library/python/pycurl-39
-    pkg:/library/python/pyopenssl-35
     pkg:/library/python/pyopenssl-39
-    pkg:/library/python/pyyaml-35
     pkg:/library/python/pyyaml-39
-    pkg:/library/python/rapidjson-35
     pkg:/library/python/rapidjson-39
-    pkg:/library/python/six-35
     pkg:/library/python/six-39
     pkg:/locale/en
     pkg:/network/netcat
     pkg:/package/svr4
-    pkg:/runtime/python-35
     pkg:/runtime/python-39
     pkg:/service/network/dns/mdns
     pkg:/shell/bash
@@ -58,7 +40,6 @@
     pkg:/system/library/dbus
     pkg:/system/library/gcc-4-runtime
     pkg:/system/library/math
-    pkg:/system/library/python/libbe-35
     pkg:/system/library/python/libbe-39
     pkg:/system/library/security/crypto
     pkg:/system/network
@@ -70,5 +51,5 @@
     pkg:/text/locale
     pkg:/text/tidy
     pkg:/web/server/apache-24
-    pkg:/web/server/apache-24/module/apache-wsgi-35
+    pkg:/web/server/apache-24/module/apache-wsgi-39
     pkg:/web/wget

src/pkg/manifests/developer:opensolaris:pkg5.p5m

@@ -27,49 +27,30 @@ set name=pkg.description \
     value="This package should be installed on systems used for development of the pkg(5) project"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Distribution Tools"
-depend type=conditional fmri=web/server/apache-24/module/apache-wsgi-35 \
-    predicate=runtime/python-35
 depend type=conditional fmri=web/server/apache-24/module/apache-wsgi-39 \
     predicate=runtime/python-39
 depend type=require fmri=pkg:/developer/build/make
 depend type=require fmri=pkg:/developer/build/onbld
 depend type=require fmri=pkg:/developer/gnome/gettext
 depend type=require fmri=pkg:/developer/python/pylint
 depend type=require fmri=pkg:/developer/versioning/mercurial
-depend type=require fmri=pkg:/library/python/cffi-35
 depend type=require fmri=pkg:/library/python/cffi-39
-depend type=require fmri=pkg:/library/python/cherrypy-35
 depend type=require fmri=pkg:/library/python/cherrypy-39
-depend type=require fmri=pkg:/library/python/coverage-35
 depend type=require fmri=pkg:/library/python/coverage-39
-depend type=require fmri=pkg:/library/python/cryptography-35
 depend type=require fmri=pkg:/library/python/cryptography-39
-depend type=require fmri=pkg:/library/python/jsonrpclib-35
 depend type=require fmri=pkg:/library/python/jsonrpclib-39
-depend type=require fmri=pkg:/library/python/jsonschema-35
 depend type=require fmri=pkg:/library/python/jsonschema-39
-depend type=require fmri=pkg:/library/python/mako-35
 depend type=require fmri=pkg:/library/python/mako-39
-depend type=require fmri=pkg:/library/python/ply-35
 depend type=require fmri=pkg:/library/python/ply-39
-depend type=require fmri=pkg:/library/python/portend-35
 depend type=require fmri=pkg:/library/python/portend-39
-depend type=require fmri=pkg:/library/python/prettytable-35
 depend type=require fmri=pkg:/library/python/prettytable-39
-depend type=require fmri=pkg:/library/python/pybonjour-35
 depend type=require fmri=pkg:/library/python/pybonjour-39
-depend type=require fmri=pkg:/library/python/pycodestyle-35
 depend type=require fmri=pkg:/library/python/pycodestyle-39
-depend type=require fmri=pkg:/library/python/pycurl-35
 depend type=require fmri=pkg:/library/python/pycurl-39
-depend type=require fmri=pkg:/library/python/pyopenssl-35
 depend type=require fmri=pkg:/library/python/pyopenssl-39
-depend type=require fmri=pkg:/library/python/rapidjson-35
 depend type=require fmri=pkg:/library/python/rapidjson-39
-depend type=require fmri=pkg:/library/python/six-35
 depend type=require fmri=pkg:/library/python/six-39
 depend type=require fmri=pkg:/package/svr4
-depend type=require fmri=pkg:/runtime/python-35
 depend type=require fmri=pkg:/runtime/python-39
 depend type=require fmri=pkg:/service/network/dns/mdns
 depend type=require fmri=pkg:/system/header
@@ -81,5 +62,4 @@ depend type=require fmri=pkg:/text/tidy
 depend type=require fmri=pkg:/web/server/apache-24
 depend type=require fmri=pkg:/web/wget
 # p5p support in the system repository requires mod_wsgi
-depend type=require-any fmri=web/server/apache-24/module/apache-wsgi-35 \
-    fmri=web/server/apache-24/module/apache-wsgi-39
+depend type=require fmri=web/server/apache-24/module/apache-wsgi-39

src/pkg/manifests/package:pkg.p5m

@@ -475,9 +475,4 @@ depend type=require fmri=crypto/ca-certificates
 depend type=require fmri=library/python/cffi
 depend type=require fmri=library/python/prettytable
 depend type=require fmri=locale/en
-# These usually come in as dependencies of the install/beadm package, but
-# during the transition to python 3.9, we need to ensure we have both
-# (and since we have a specific dependency on the python libbe module,
-#  it's probably a good idea anyway)
-depend type=require fmri=system/library/python/libbe-35
 depend type=require fmri=system/library/python/libbe-39

src/pkg/manifests/package:pkg:depot.p5m

@@ -61,8 +61,6 @@ file path=var/log/pkg/depot/access_log owner=pkg5srv mode=0644 preserve=true
 file path=var/log/pkg/depot/error_log owner=pkg5srv mode=0644 preserve=true
 file path=var/log/pkg/depot/rewrite.log owner=pkg5srv mode=0644 preserve=true
 license cr_Oracle license=cr_Oracle
-depend type=conditional fmri=web/server/apache-24/module/apache-wsgi-35 \
-    predicate=runtime/python-35
 depend type=conditional fmri=web/server/apache-24/module/apache-wsgi-39 \
     predicate=runtime/python-39
 #
@@ -71,5 +69,4 @@ depend type=conditional fmri=web/server/apache-24/module/apache-wsgi-39 \
 #
 depend type=require fmri=web/server/apache-24
 # p5p support in the system repository requires mod_wsgi
-depend type=require-any fmri=web/server/apache-24/module/apache-wsgi-35 \
-    fmri=web/server/apache-24/module/apache-wsgi-39
+depend type=require fmri=web/server/apache-24/module/apache-wsgi-39

src/pkg/manifests/package:pkg:system-repository.p5m

@@ -68,18 +68,14 @@ file path=var/log/pkg/sysrepo/access_log owner=pkg5srv mode=0644 preserve=true
 file path=var/log/pkg/sysrepo/error_log owner=pkg5srv mode=0644 preserve=true
 file path=var/log/pkg/sysrepo/rewrite.log owner=pkg5srv mode=0644 preserve=true
 license cr_Oracle license=cr_Oracle
-depend type=conditional fmri=web/server/apache-24/module/apache-wsgi-35 \
-    predicate=runtime/python-35
 depend type=conditional fmri=web/server/apache-24/module/apache-wsgi-39 \
     predicate=runtime/python-39
 # force a dependency on the six package because we bypass dependency check for it
-depend type=require fmri=library/python/six-35
 depend type=require fmri=library/python/six-39
 #
 # The manual dependency on apache results from our calling apachectl from
 # our method script, and can't be detected by pkgdepend.
 #
 depend type=require fmri=web/server/apache-24
 # p5p support in the system repository requires mod_wsgi
-depend type=require-any fmri=web/server/apache-24/module/apache-wsgi-35 \
-    fmri=web/server/apache-24/module/apache-wsgi-39
+depend type=require fmri=web/server/apache-24/module/apache-wsgi-39

src/pkg/manifests/system:zones:brand:bhyve.p5m

@@ -34,7 +34,6 @@ file path=usr/lib/brand/bhyve/support mode=0755
 file path=usr/lib/brand/bhyve/uninstall mode=0755
 file path=usr/lib/brand/bhyve/util.ksh mode=0644
 file path=usr/lib/brand/bhyve/vars.ksh mode=0644
-depend type=require fmri=library/python/pyyaml-35
 depend type=require fmri=library/python/pyyaml-39
 depend type=require fmri=network/netcat
 depend type=require fmri=system/bhyve

src/setup.py

@@ -107,7 +107,7 @@
 
 # Extract Python minor version.
 py_version = '.'.join(platform.python_version_tuple()[:2])
-assert py_version in ('3.5' '3.9')
+assert py_version in ('3.9')
 py_install_dir = 'usr/lib/python' + py_version + '/vendor-packages'
 
 py64_executable = '/usr/bin/python' + py_version