On Tue, May 02, 2017 at 01:30:18PM +0300, Pavel Korovin wrote:
> On 05/02, Landry Breuil wrote:
> > That's also what pavel did in his submission - so we're definitely going
> > this way. Now all the pieces of the puzzle need to be upgraded/tested
> > altogether. Ie:
> > - new dependencies of twisted imported (4 or 6 new ports?)
> > - the 'new' twisted layout needs to be imported
> > - and the ports using it need to be tested/updated to work with it (or be
> > removed).
> >
> > > As for the various divmod packages (py-epsilon, py-nevow, py-axiom) that
> > > depends
> > > on twisted, I think they are dead and they can be removed.
> >
> > Well, those arent really "dead" since they were "adopted" by upstream
> > twisted (under https://github.com/twisted), they just need to change
> > upstream if we want to keep them, or remove them if they're
> > unused/useless.
>
> Landry, I'd like to re-check new py-twisted dependencies (py2/py3
> builds/tests) and submit it one by one to ports@ for commit.
>
> After that I'll try to resolve issues with ports dependent on py-twisted
> so we can decide whether update or remove it. Finally, update py-twisted
> along with dependent ports.
So, all dependencies are in.
I've tested the py-twisted new layout, and i spotted that it was missing
the @pkgpath annotations in PLIST to ease the upgrade path:
@pkgpath devel/py-twisted/core
@pkgpath devel/py-twisted/conch
@pkgpath devel/py-twisted/lore
@pkgpath devel/py-twisted/mail
@pkgpath devel/py-twisted/news
@pkgpath devel/py-twisted/names
@pkgpath devel/py-twisted/pair
@pkgpath devel/py-twisted/runner
@pkgpath devel/py-twisted/web
@pkgpath devel/py-twisted/web2
@pkgpath devel/py-twisted/words
I'm going to fiddle a bit more with it. Here's a diff to adapt
buildbot/buildslave, dependencies paths need ajusting, and only a
oneliner diff is needed for buildbot itself to start and run fine.
Now, all the other ports depending on it need to be checked/fixed before
we can commit the whole thing.
Landry
Index: py-buildbot/Makefile
===================================================================
RCS file: /cvs/ports/devel/py-buildbot/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- py-buildbot/Makefile 15 May 2016 09:04:09 -0000 1.34
+++ py-buildbot/Makefile 6 May 2017 10:23:24 -0000
@@ -5,7 +5,7 @@
MODPY_EGG_VERSION = 0.8.12
DISTNAME = buildbot-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME:S/p/pl/}
-REVISION = 5
+REVISION = 6
CATEGORIES = devel
@@ -25,11 +25,7 @@
RUN_DEPENDS = databases/py-sqlalchemy \
databases/py-sqlalchemy-migrate>=0.7.2 \
devel/py-dateutil \
- devel/py-twisted/core \
- devel/py-twisted/conch \
- devel/py-twisted/mail \
- devel/py-twisted/web \
- devel/py-twisted/words \
+ devel/py-twisted \
www/py-jinja2
TEST_DEPENDS = ${RUN_DEPENDS} \
Index: py-buildbot/patches/patch-buildbot_status_web_baseweb_py
===================================================================
RCS file: py-buildbot/patches/patch-buildbot_status_web_baseweb_py
diff -N py-buildbot/patches/patch-buildbot_status_web_baseweb_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ py-buildbot/patches/patch-buildbot_status_web_baseweb_py 6 May 2017
10:23:24 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Fix runtime with twisted >= 17.
+
+Index: buildbot/status/web/baseweb.py
+--- buildbot/status/web/baseweb.py.orig
++++ buildbot/status/web/baseweb.py
+@@ -53,7 +53,6 @@ from twisted.cred.portal import Portal
+ from twisted.internet import defer
+ from twisted.python import log
+ from twisted.spread import pb
+-from twisted.web import distrib
+ from twisted.web import guard
+ from twisted.web import resource
+ from twisted.web import server
Index: py-buildslave/Makefile
===================================================================
RCS file: /cvs/ports/devel/py-buildslave/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- py-buildslave/Makefile 29 Sep 2015 10:51:44 -0000 1.18
+++ py-buildslave/Makefile 6 May 2017 10:23:24 -0000
@@ -5,7 +5,7 @@
MODPY_EGG_VERSION= 0.8.12
DISTNAME= buildbot-slave-${MODPY_EGG_VERSION}
PKGNAME= py-buildslave-${MODPY_EGG_VERSION:S/p/pl/}
-REVISION= 1
+REVISION= 2
CATEGORIES= devel
@@ -22,7 +22,7 @@
MODPY_SETUPTOOLS= Yes
-RUN_DEPENDS= devel/py-twisted/core
+RUN_DEPENDS= devel/py-twisted
TEST_DEPENDS= ${RUN_DEPENDS} \
devel/py-mock
