[DRAFT] Tentative Python3.7 + Trac 1.6 update

DjangoPlugin/tracdjangoplugin/__init__.py

@@ -2,7 +2,6 @@
 from trac.web.chrome import INavigationContributor
 from trac.web.api import IRequestFilter, IRequestHandler
 from trac.wiki.web_ui import WikiModule
-from trac.util import Markup
 from trac.util.html import tag
 from tracext.github import GitHubBrowser
 
@@ -75,7 +74,7 @@ def get_navigation_items(self, req):
             (
                 "mainnav",
                 "custom_reports",
-                Markup('<a href="%s">Reports</a>' % req.href.wiki("Reports")),
+                tag.a("Reports", href=req.href.wiki("Reports")),
             ),
         ]
 

requirements.txt

@@ -1,24 +1,20 @@
-Trac==1.4.4
+Trac==1.6.0
 Pygments==2.5.2
 dnspython==1.15
-spambayes == 1.1b1
-psycopg2==2.7.6.1 --no-binary=psycopg2
-docutils==0.14
+psycopg2==2-2.9.9
+#docutils==0.14
 Django==1.11.29
 libsass==0.17.0
-Genshi==0.7.7  # still required by some plugins
 
 # Trac plugins
-TracSpamFilter==1.2.7
-# TracXMLRPC from PyPI does not (yet) have a 1.2.0 release (compatible with Trac 1.4)
+https://trac.edgewall.org/browser/plugins/trunk/spam-filter?rev=17752&format=zip
+# TracXMLRPC from PyPI does not (yet) have a 1.2.0 release (compatible with Trac >=1.4)
 https://trac-hacks.org/browser/xmlrpcplugin/trunk?rev=18591&format=zip
 
-oauthlib==2.1.0
-requests==2.20.1
-requests-oauthlib==1.0.0
-trac-github==2.3
+# No pypi release compatible with trac 1.6 yet
+trac-github[oauth] @ git+https://github.com/trac-hacks/trac-github.git@004b382bb3c76c4d52a04aaaf57d00807e14f0d2
 
 gunicorn==19.10.0
 sentry-sdk==1.11.0
 
--e ./DjangoPlugin
+-e ./DjangoPlugin