textproc/py-python-lsp-black: New port: Black plugin for the Python L…

…SP Server
freebsd · Oct 13, 2022 · 0c041ad · 0c041ad
1 parent db2b8e7
commit 0c041ad
Show file tree

Hide file tree

Showing 27 changed files with 193 additions and 89 deletions.
diff --git a/cad/appcsxcad/Makefile b/cad/appcsxcad/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	appcsxcad
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.2-9
 DISTVERSIONSUFFIX=	-g97ba30e
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libCSXCAD.so:cad/csxcad \
 		libQCSXCAD.so:cad/qcsxcad \
 		libsz.so:science/libaec \
 		libtiff.so:graphics/tiff \
-		libvtkCommonCore-9.1.so:math/vtk9
+		libvtkCommonCore-${VTK_VER}.so:math/vtk9
 
 USES=		cmake jpeg pkgconfig qt:5 xorg
 USE_QT=		core gui sql widgets xml buildtools:build qmake:build
@@ -31,7 +31,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	thliebig
 GH_PROJECT=	AppCSXCAD
 
-CMAKE_ARGS=	-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1
+CMAKE_ARGS=	-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER}
 
 PLIST_FILES=	bin/AppCSXCAD
 
@@ -40,4 +40,5 @@ post-install:
 
 # an example of file that AppCSXCAD opens (zipped): http://openems.de/forum/download/file.php?id=418&sid=6daebbb2df72b415fa2ec7031ffa6ca9
 
+.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/cad/csxcad/Makefile b/cad/csxcad/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	csxcad
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.2-109
 DISTVERSIONSUFFIX=	-gcd9decb
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -22,7 +22,7 @@ LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libsz.so:science/libaec \
 		libtiff.so:graphics/tiff \
 		libtinyxml.so:textproc/tinyxml \
-		libvtkCommonCore-9.1.so:math/vtk9
+		libvtkCommonCore-${VTK_VER}.so:math/vtk9
 
 USES=		cmake jpeg pkgconfig
 USE_LDCONFIG=	yes
@@ -32,6 +32,7 @@ GH_ACCOUNT=	thliebig
 GH_PROJECT=	${PORTNAME:tu}
 
 CMAKE_ARGS=	-DFPARSER_ROOT_DIR=${LOCALBASE} \
-		-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1
+		-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER}
 
+.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	opencascade
 PORTVERSION=	7.6.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	cad science
 MASTER_SITES=	LOCAL/thierry
 
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig	\
 		libfreetype.so:print/freetype2		\
 		libexpat.so:textproc/expat2		\
 		libpng16.so:graphics/png		\
-		libvtksys-${VTKVER}.so:math/vtk${VTKVER:R}
+		libvtksys-${VTK_VER}.so:math/vtk${VTK_VER:R}
 RUN_DEPENDS=	bash:shells/bash
 
 # Check ${WRKSRC}/dox/overview/overview.md
@@ -40,8 +40,6 @@ SHEBANG_FILES=	adm/templates/*.sh	\
 		gendoc
 ENVSH=		adm/templates/env.sh
 
-VTKVER=		9.1
-
 OPTIONS_DEFINE=	DOCS DOXYGEN FFMPEG VIS
 VIS_DESC=	Build Visualizazion module (requires OpenGL, freetype, ftgl)
 OPTIONS_DEFAULT=FFMPEG VIS
@@ -62,7 +60,7 @@ CMAKE_ARGS+=	-DINSTALL_DIR=${OCCROOT}				\
 		-DUSE_TBB:BOOL=OFF					\
 		-DUSE_RAPIDJSON:BOOL=ON					\
 		-DUSE_VTK:BOOL=ON					\
-		-D3RDPARTY_VTK_INCLUDE_DIR:PATH=${LOCALBASE}/include/vtk-${VTKVER}
+		-D3RDPARTY_VTK_INCLUDE_DIR:PATH=${LOCALBASE}/include/vtk-${VTK_VER}
 CONFIGURE_ENV+=	DESTDIR=${STAGEDIR}
 
 .if defined(MAINTAINER_MODE)
@@ -181,4 +179,5 @@ regression-test:	install
 	DRAWEXE -f ${FILESDIR}/regtest "
 .endif
 
+.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/cad/opencascade/files/patch-src_IVtkDraw_IVtkDraw__Interactor.cxx b/cad/opencascade/files/patch-src_IVtkDraw_IVtkDraw__Interactor.cxx
@@ -0,0 +1,17 @@
+- workaround for https://gitlab.kitware.com/vtk/vtk/-/issues/18683
+
+--- src/IVtkDraw/IVtkDraw_Interactor.cxx.orig	2021-10-30 11:13:52 UTC
++++ src/IVtkDraw/IVtkDraw_Interactor.cxx
+@@ -26,6 +26,12 @@
+ #ifdef AllValues
+ #undef AllValues
+ #endif
++#ifdef Status
++#undef Status
++#endif
++#ifdef Success
++#undef Success
++#endif
+
+ #include <vtkXRenderWindowInteractor.h>
+ #include <vtkXOpenGLRenderWindow.h>
diff --git a/cad/qcsxcad/Makefile b/cad/qcsxcad/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	qcsxcad
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.2-9
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-g3f09a8b
 CATEGORIES=	cad
 
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libCSXCAD.so:cad/csxcad \
 		libpng16.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libtinyxml.so:textproc/tinyxml \
-		libvtkCommonCore-9.1.so:math/vtk9
+		libvtkCommonCore-${VTK_VER}.so:math/vtk9
 
 USES=		cmake gl jpeg pkgconfig qt:5 xorg
 USE_QT=		core gui opengl sql widgets xml buildtools:build qmake:build
@@ -30,6 +30,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	thliebig
 GH_PROJECT=	${PORTNAME:tu}
 
-CMAKE_ARGS=	-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1
+CMAKE_ARGS=	-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER}
 
+.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/devel/py-spyder/Makefile b/devel/py-spyder/Makefile
@@ -7,22 +7,85 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Scientific PYthon Development EnviRonment, an alternative to IDLE
-WWW=		https://github.com/spyder-ide/spyder/
+WWW=		https://www.spyder-ide.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}QtAwesome>0:x11-fonts/py-QtAwesome@${PY_FLAVOR} \
+RUN_DEPENDS=	\
 		${PYTHON_PKGNAMEPREFIX}QtPy>=1.3.1:devel/py-QtPy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cloudpickle>=0.3.1:devel/py-cloudpickle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.9.0:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbconvert>=4.0:devel/py-nbconvert@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pep8>=0.6:devel/pep8@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.3:devel/py-pycodestyle@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}qtconsole>=4.3.0:devel/py-qtconsole@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpydoc>0:textproc/py-numpydoc@${PY_FLAVOR} \
-		pylint${PYTHON_PKGNAMESUFFIX}>=0.25:devel/pylint@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}parso>=0.1.1:textproc/py-parso@${PY_FLAVOR}
+
+		${PYTHON_PKGNAMEPREFIX}parso>=0.7.0:textproc/py-parso@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pexpect>=4.4.0:misc/py-pexpect@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pickleshare>=0.4:databases/py-pickleshare@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}psutil>=5.3:sysutils/py-psutil@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments@${PY_FLAVOR}
+		pylint${PYTHON_PKGNAMESUFFIX}>=2.5.0:devel/pylint@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pylint-venv>=2.1.1:devel/py-pylint-venv@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}python-lsp-server>=1.5.0:textproc/py-python-lsp-server@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyxdg>=0.26:devel/py-pyxdg@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyzmq>=22.1.0:net/py-pyzmq@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}QDarkStyle>=3.0.2:textproc/py-QDarkStyle@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}qstylizer>=0.1.10:devel/py-qstylizer@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}QtAwesome>=1.0.2:x11-fonts/py-QtAwesome@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}qtconsole>=5.3.2:devel/py-qtconsole@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}QtPy>=2.1.0:py-QtPy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}rtree>=0.9.7:devel/py-rtree@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}spyder-kernels>=2.3.3:devel/py-spyder-kernels@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}textdistance>=4.2.0:textproc/py-textdistance@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}three-merge>=0.1.1:textproc/py-three-merge@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}watchdog>=0.10.3:devel/py-watchdog@${PY_FLAVOR}
+
+install_requires = [
+    'applaunchservices>=0.3.0;platform_system=="Darwin"',
+    'atomicwrites>=1.2.0',
+    'chardet>=2.0.0',
+    'cloudpickle>=0.5.0',
+    'cookiecutter>=1.6.0',
+    'diff-match-patch>=20181111',
+    'intervaltree>=3.0.2',
+    'ipython>=7.31.1,<8.0.0',
+    'jedi>=0.17.2,<0.19.0',
+    'jellyfish>=0.7',
+    'jsonschema>=3.2.0',
+    'keyring>=17.0.0',
+    'nbconvert>=4.0',
+    'numpydoc>=0.6.0',
+    # Required to get SSH connections to remote kernels
+    'paramiko>=2.4.0;platform_system=="Windows"',
+    'parso>=0.7.0,<0.9.0',
+    'pexpect>=4.4.0',
+    'pickleshare>=0.4',
+    'psutil>=5.3',
+    'pygments>=2.0',
+    'pylint>=2.5.0,<3.0',
+    'pylint-venv>=2.1.1',
+    'python-lsp-black>=1.2.0',
+    'pyls-spyder>=0.4.0',
+    'pyqt5<5.16',
+    'pyqtwebengine<5.16',
+    'python-lsp-server[all]>=1.5.0,<1.6.0',
+    'pyxdg>=0.26;platform_system=="Linux"',
+    'pyzmq>=22.1.0',
+    'qdarkstyle>=3.0.2,<3.1.0',
+    'qstylizer>=0.1.10',
+    'qtawesome>=1.0.2',
+    'qtconsole>=5.3.2,<5.4.0',
+    'qtpy>=2.1.0',
+    'rtree>=0.9.7',
+    'setuptools>=49.6.0',
+    'sphinx>=0.6.6',
+    'spyder-kernels>=2.3.3,<2.4.0',
+    'textdistance>=4.2.0',
+    'three-merge>=0.1.1',
+    'watchdog>=0.10.3'
+]
 
 USES=		desktop-file-utils python:3.7+ pyqt:5
 USE_GITHUB=	yes
@@ -53,13 +116,10 @@ SYMPY_DESC=	Symbolic mathematics in the IPython Console
 
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
 IPYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>=6.0:devel/ipython@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.11:net/py-pyzmq@${PY_FLAVOR}
 MATPLOT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=1.0:math/py-matplotlib@${PY_FLAVOR}
 NUMPY_RUN_DEPENDS=	${PYNUMPY}
 PANDAS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pandas>=0.13.1:math/py-pandas@${PY_FLAVOR}
-PSUTIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=0.3:sysutils/py-psutil@${PY_FLAVOR}
 PYFLAKES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyflakes>=0.5:devel/py-pyflakes@${PY_FLAVOR}
-PYGMENTS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR}
 ROPE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}rope>=0.9.2:devel/py-rope@${PY_FLAVOR}
 SCIPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 SPHINX_RUN_DEPENDS=	${DOCS_BUILD_DEPENDS}

diff --git a/devel/py-spyder/files/patch-setup.py b/devel/py-spyder/files/patch-setup.py
diff --git a/graphics/cloudcompare/Makefile b/graphics/cloudcompare/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	cloudcompare
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.12.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 
 MAINTAINER=	nc@FreeBSD.org
@@ -75,7 +75,7 @@ PLUGINS_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 			libfreetype.so:print/freetype2 \
 			libpng.so:graphics/png \
 			libtiff.so:graphics/tiff \
-			libvtkCommonCore-9.1.so:math/vtk9
+			libvtkCommonCore-${VTK_VER}.so:math/vtk9
 PLUGINS_IMPLIES=	SHAPELIB
 
 pre-configure:
@@ -88,4 +88,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/snap/gui/cloudcompare.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/snap/gui/cloudcompare.png ${STAGEDIR}${PREFIX}/share/pixmaps
 
+.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/graphics/f3d/Makefile b/graphics/f3d/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	f3d
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -11,12 +11,16 @@ WWW=		https://f3d-app.github.io/f3d/
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreeimage.so:graphics/freeimage \
+		libfreetype.so:print/freetype2 \
 		libhdf5.so:science/hdf5 \
+		libImath-3_1.so:math/Imath \
 		libnetcdf.so:science/netcdf \
-		libvtkCommonMisc-9.1.so:math/vtk9
+		libvtkCommonMisc-${VTK_VER}.so:math/vtk9
 
-USES=		cmake:testing compiler:c++17-lang desktop-file-utils gl xorg
+USES=		cmake:testing compiler:c++17-lang desktop-file-utils gl tcl tk xorg
 USE_GL=		gl glu
 USE_XORG=	ice sm x11 xt
 
@@ -57,4 +61,5 @@ RAYTRACING_BROKEN=		Requires VTK::RenderingRayTracing enabled in VTK
 post-install:
 	@${RM} -r ${STAGEDIR}${DOCSDIR}
 
+.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/graphics/mirtk/Makefile b/graphics/mirtk/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mirtk
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.0-178
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONSUFFIX=	-g973ce2f
 CATEGORIES=	graphics
 
@@ -31,7 +31,8 @@ TBB_LIB_DEPENDS=	libtbb.so:devel/onetbb
 
 VTK_DESC=		Build with the VTK toolkit
 VTK_CMAKE_BOOL=		WITH_VTK
-VTK_LIB_DEPENDS=	libvtkCommonCore-9.1.so:math/vtk9 \
+VTK_LIB_DEPENDS=	libvtkCommonCore-${VTK_VER}.so:math/vtk9 \
 			libexpat.so:textproc/expat2
 
+.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	opencv
 DISTVERSION=	4.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 
 MAINTAINER=	desktop@FreeBSD.org
@@ -124,7 +124,7 @@ GTK3_CMAKE_BOOL=	WITH_GTK
 
 VTK_DESC=		Include VTK library support (build opencv_viz module)
 VTK_CMAKE_BOOL=		WITH_VTK
-VTK_LIB_DEPENDS=	libvtkCommonCore-9.1.so:math/vtk9
+VTK_LIB_DEPENDS=	libvtkCommonCore-${VTK_VER}.so:math/vtk9
 VTK_USES=		qt:5
 VTK_USE=		QT=buildtools:build,qmake:build
 ###
@@ -235,4 +235,5 @@ post-patch:
 	${REINPLACE_CMD} -e 's|/usr/lib/atlas-base|${LOCALBASE}/lib|g' ${WRKSRC}/cmake/OpenCVFindAtlas.cmake
 	${REINPLACE_CMD} -e 's|/usr/include/atlas|${LOCALBASE}/include|g' ${WRKSRC}/cmake/OpenCVFindAtlas.cmake
 
+.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/graphics/pcl-pointclouds/Makefile b/graphics/pcl-pointclouds/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	pcl
 DISTVERSION=	1.12.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics math
 MASTER_SITES=	https://github.com/PointCloudLibrary/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/
 PKGNAMESUFFIX=	-pointclouds
@@ -81,7 +81,8 @@ VTK_DESC=		Build VTK visualizations
 VTK_USES=		gl qt:5
 VTK_USE=		GL=gl,glu QT=core,gui,opengl,widgets,buildtools:build,qmake:build
 VTK_CMAKE_BOOL=		WITH_VTK
-VTK_CMAKE_ON=		-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1
-VTK_LIB_DEPENDS=	libvtkCommonCore-9.1.so:math/vtk9
+VTK_CMAKE_ON=		-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER}
+VTK_LIB_DEPENDS=	libvtkCommonCore-${VTK_VER}.so:math/vtk9
 
+.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/graphics/py-mayavi/Makefile b/graphics/py-mayavi/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	mayavi
 DISTVERSION=	4.8.0
+PORTREVISION=	1
 CATEGORIES=	graphics science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -52,4 +53,5 @@ fix-plist:
 do-test:
 	@${SETENV} ${TEST_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} ${PYTHON_CMD} ${WRKSRC}/examples/mayavi/interactive/coil_design_application.py
 
+.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>