UPDATE x11/py-qtawesome-0.6.0

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE x11/py-qtawesome-0.6.0

Björn Ketelaars
Below a simple update to the latest version of py-qtawesome. Changelog
can be found at
https://github.com/spyder-ide/qtawesome/blob/v0.6.0/CHANGELOG.md.

This update is needed for an update of its only consumer: spyder.

Run tested in combination with the above.

Comments/OK?


diff --git Makefile Makefile
index 9069fc30ecd..2e21ad7dd8f 100644
--- Makefile
+++ Makefile
@@ -2,11 +2,10 @@
 
 COMMENT = FontAwesome icons in PyQt and PySide applications
 
-MODPY_EGG_VERSION = 0.4.4
+MODPY_EGG_VERSION = 0.6.0
 DISTNAME = QtAwesome-${MODPY_EGG_VERSION}
 PKGNAME = py-qtawesome-${MODPY_EGG_VERSION}
 CATEGORIES = x11
-REVISION = 1
 
 HOMEPAGE = https://github.com/spyder-ide/qtawesome
 
diff --git distinfo distinfo
index a0f8ddbe922..77da6d6251d 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (QtAwesome-0.4.4.tar.gz) = UPnB2c405X9bE+921ch+Bt6YBLjf4cNMS6cxlyAPh4o=
-SIZE (QtAwesome-0.4.4.tar.gz) = 159621
+SHA256 (QtAwesome-0.6.0.tar.gz) = Xk6VBNcoi85OHDCx8qpfFRDHJmkB2IdPD4NP+Sm/Hhc=
+SIZE (QtAwesome-0.6.0.tar.gz) = 707834
diff --git pkg/PLIST pkg/PLIST
index 8060a6f47b0..845f2c34970 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -17,8 +17,16 @@ lib/python${MODPY_VERSION}/site-packages/qtawesome/animation.py
 lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/
 lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/elusiveicons-webfont-charmap.json
 lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/elusiveicons-webfont.ttf
-lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/fontawesome-webfont-charmap.json
-lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/fontawesome-webfont.ttf
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/fontawesome4.7-webfont-charmap.json
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/fontawesome4.7-webfont.ttf
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/fontawesome5-brands-webfont-charmap.json
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/fontawesome5-brands-webfont.ttf
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/fontawesome5-regular-webfont-charmap.json
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/fontawesome5-regular-webfont.ttf
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/fontawesome5-solid-webfont-charmap.json
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/fontawesome5-solid-webfont.ttf
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/materialdesignicons-webfont-charmap.json
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/materialdesignicons-webfont.ttf
 lib/python${MODPY_VERSION}/site-packages/qtawesome/iconic_font.py
 lib/python${MODPY_VERSION}/site-packages/qtawesome/tests/
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/qtawesome/tests/${MODPY_PYCACHE}/

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE x11/py-qtawesome-0.6.0

Kurt Mosiejczuk-9
On Sun, Nov 10, 2019 at 03:17:21PM +0100, Bj??rn Ketelaars wrote:
> Below a simple update to the latest version of py-qtawesome. Changelog
> can be found at
> https://github.com/spyder-ide/qtawesome/blob/v0.6.0/CHANGELOG.md.

> This update is needed for an update of its only consumer: spyder.

> Run tested in combination with the above.

> Comments/OK?

I'd prefer this. It adds the glue to enable the tests. Only one of two
pass, but it's still better than NO_TEST.

--Kurt

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE x11/py-qtawesome-0.6.0

Kurt Mosiejczuk-9
On Sun, Nov 10, 2019 at 08:38:12PM +0200, Kurt Mosiejczuk wrote:
> On Sun, Nov 10, 2019 at 03:17:21PM +0100, Bj??rn Ketelaars wrote:
> > Below a simple update to the latest version of py-qtawesome. Changelog
> > can be found at
> > https://github.com/spyder-ide/qtawesome/blob/v0.6.0/CHANGELOG.md.

> > This update is needed for an update of its only consumer: spyder.

> > Run tested in combination with the above.

> > Comments/OK?

> I'd prefer this. It adds the glue to enable the tests. Only one of two
> pass, but it's still better than NO_TEST.

Now with actual diff!

--Kurt

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/py-qtawesome/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 12 Jul 2019 20:51:20 -0000 1.5
+++ Makefile 10 Nov 2019 18:36:17 -0000
@@ -2,11 +2,10 @@
 
 COMMENT = FontAwesome icons in PyQt and PySide applications
 
-MODPY_EGG_VERSION = 0.4.4
+MODPY_EGG_VERSION = 0.6.0
 DISTNAME = QtAwesome-${MODPY_EGG_VERSION}
 PKGNAME = py-qtawesome-${MODPY_EGG_VERSION}
 CATEGORIES = x11
-REVISION = 1
 
 HOMEPAGE = https://github.com/spyder-ide/qtawesome
 
@@ -17,13 +16,20 @@ MODULES = lang/python
 
 RUN_DEPENDS = devel/py-six${MODPY_FLAVOR} \
  x11/py-qtpy${MODPY_FLAVOR}
+TEST_DEPENDS = x11/py-qt5${MODPY_FLAVOR}
 
 MODPY_PI = Yes
 MODPY_SETUPTOOLS = Yes
+MODPY_PYTEST = Yes
+MODPY_PYTEST_ARGS = qtawesome
+
+# Wants py-qtbot for one test but doesn't work *with* py-qtbot
 
 FLAVORS = python3
 FLAVOR ?=
 
-NO_TEST = Yes
+pre-test:
+ ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
+
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/py-qtawesome/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 23 Feb 2017 12:37:15 -0000 1.2
+++ distinfo 10 Nov 2019 18:36:17 -0000
@@ -1,2 +1,2 @@
-SHA256 (QtAwesome-0.4.4.tar.gz) = UPnB2c405X9bE+921ch+Bt6YBLjf4cNMS6cxlyAPh4o=
-SIZE (QtAwesome-0.4.4.tar.gz) = 159621
+SHA256 (QtAwesome-0.6.0.tar.gz) = Xk6VBNcoi85OHDCx8qpfFRDHJmkB2IdPD4NP+Sm/Hhc=
+SIZE (QtAwesome-0.6.0.tar.gz) = 707834
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/py-qtawesome/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 23 Feb 2017 12:37:15 -0000 1.2
+++ pkg/PLIST 10 Nov 2019 18:36:17 -0000
@@ -17,8 +17,16 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/
 lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/elusiveicons-webfont-charmap.json
 lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/elusiveicons-webfont.ttf
-lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/fontawesome-webfont-charmap.json
-lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/fontawesome-webfont.ttf
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/fontawesome4.7-webfont-charmap.json
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/fontawesome4.7-webfont.ttf
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/fontawesome5-brands-webfont-charmap.json
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/fontawesome5-brands-webfont.ttf
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/fontawesome5-regular-webfont-charmap.json
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/fontawesome5-regular-webfont.ttf
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/fontawesome5-solid-webfont-charmap.json
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/fontawesome5-solid-webfont.ttf
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/materialdesignicons-webfont-charmap.json
+lib/python${MODPY_VERSION}/site-packages/qtawesome/fonts/materialdesignicons-webfont.ttf
 lib/python${MODPY_VERSION}/site-packages/qtawesome/iconic_font.py
 lib/python${MODPY_VERSION}/site-packages/qtawesome/tests/
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/qtawesome/tests/${MODPY_PYCACHE}/

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE x11/py-qtawesome-0.6.0

Björn Ketelaars
In reply to this post by Kurt Mosiejczuk-9
On Sun 10/11/2019 21:55, Kurt Mosiejczuk wrote:

> On Sun, Nov 10, 2019 at 08:38:12PM +0200, Kurt Mosiejczuk wrote:
> > On Sun, Nov 10, 2019 at 03:17:21PM +0100, Bj??rn Ketelaars wrote:
> > > Below a simple update to the latest version of py-qtawesome. Changelog
> > > can be found at
> > > https://github.com/spyder-ide/qtawesome/blob/v0.6.0/CHANGELOG.md.
>
> > > This update is needed for an update of its only consumer: spyder.
>
> > > Run tested in combination with the above.
>
> > > Comments/OK?
>
> > I'd prefer this. It adds the glue to enable the tests. Only one of two
> > pass, but it's still better than NO_TEST.
>
> Now with actual diff!

'make test' works for me for both flavors. Thanks!

Additional comments/OK?

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE x11/py-qtawesome-0.6.0

Kurt Mosiejczuk-9
On Mon, Nov 11, 2019 at 05:30:15PM +0100, Bj??rn Ketelaars wrote:

> On Sun 10/11/2019 21:55, Kurt Mosiejczuk wrote:
> > On Sun, Nov 10, 2019 at 08:38:12PM +0200, Kurt Mosiejczuk wrote:
> > > On Sun, Nov 10, 2019 at 03:17:21PM +0100, Bj??rn Ketelaars wrote:
> > > > Below a simple update to the latest version of py-qtawesome. Changelog
> > > > can be found at
> > > > https://github.com/spyder-ide/qtawesome/blob/v0.6.0/CHANGELOG.md.
> >
> > > > This update is needed for an update of its only consumer: spyder.
> >
> > > > Run tested in combination with the above.
> >
> > > > Comments/OK?
> >
> > > I'd prefer this. It adds the glue to enable the tests. Only one of two
> > > pass, but it's still better than NO_TEST.
> >
> > Now with actual diff!

> 'make test' works for me for both flavors. Thanks!

> Additional comments/OK?

ok kmos

--Kurt