science/py-pymatgen: Update 2019.10.16 -> 2021.2.14

3 files changed, 20 insertions, 36 deletions

diff --git a/science/py-pymatgen/Makefile b/science/py-pymatgen/Makefile
index 6a7fe80dd90c..609a39148527 100644
--- a/science/py-pymatgen/Makefile
+++ b/science/py-pymatgen/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pymatgen
-DISTVERSION=	2019.10.16
+DISTVERSION=	2021.2.14
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,22 +14,24 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5:math/py-matplotlib@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}monty>=3.0.2:devel/py-monty@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}networkx>=2.2:math/py-networkx@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}palettable>=3.1.1:misc/py-palettable@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pydispatcher>=2.0.5:devel/py-pydispatcher@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.15.6:devel/py-ruamel.yaml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}scipy>=1.0.1:science/py-scipy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.9.3:www/py-beautifulsoup@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.3.3:math/py-matplotlib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}monty>=4.0.2:devel/py-monty@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}networkx>=2.5:math/py-networkx@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}palettable>=3.3.0:misc/py-palettable@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pandas>=1.2.1:math/py-pandas@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}plotly>=4.14.1:graphics/py-plotly@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.16.12:devel/py-ruamel.yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}scipy>=1.6.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}spglib>=1.9.9.44:science/py-spglib@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}netCDF4>0:science/py-netCDF4@${PY_FLAVOR} # see https://github.com/materialsproject/pymatgen/issues/1386
+		${PYTHON_PKGNAMEPREFIX}spglib>=1.16.1:science/py-spglib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sympy>=1.7:math/py-sympy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tabulate>=0.8.6:devel/py-tabulate@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.7.4.3:devel/py-typing-extensions@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}uncertainties>=3.1.5:math/py-uncertainties@${PY_FLAVOR}
 
 USES=		compiler:c++11-lang python:3.7+
-USE_PYTHON=	distutils concurrent autoplist
+USE_PYTHON=	distutils cython concurrent autoplist
 
 .include <bsd.port.mk>
diff --git a/science/py-pymatgen/distinfo b/science/py-pymatgen/distinfo
index 58c5ed45614b..cdf3da06297a 100644
--- a/science/py-pymatgen/distinfo
+++ b/science/py-pymatgen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1571522633
-SHA256 (pymatgen-2019.10.16.tar.gz) = a8e8b169001737cdf16bb89b26c391963ba2bead54ea510530a52586e2072234
-SIZE (pymatgen-2019.10.16.tar.gz) = 2486612
+TIMESTAMP = 1613435897
+SHA256 (pymatgen-2021.2.14.tar.gz) = b1ac61c666f9e629480a67008a44f2dcbfc5ca1a192707f83718f6e1cd981ef6
+SIZE (pymatgen-2021.2.14.tar.gz) = 2977846
diff --git a/science/py-pymatgen/files/patch-setup.py b/science/py-pymatgen/files/patch-setup.py
deleted file mode 100644
index a1e9b3834348..000000000000
--- a/science/py-pymatgen/files/patch-setup.py
+++ /dev/null
@@ -1,18 +0,0 @@
---- setup.py.orig	2020-01-23 10:17:29 UTC
-+++ setup.py
-@@ -31,7 +31,7 @@ if sys.platform.startswith('win') and platform.machine
-     extra_link_args.append('-Wl,--allow-multiple-definition')
- 
- cpp_extra_link_args = extra_link_args
--cpp_extra_compile_args = ["-Wno-cpp", "-Wno-unused-function", "-O2", "-march=native", '-std=c++11']
-+cpp_extra_compile_args = ["-Wno-cpp", "-Wno-unused-function", "-O2", '-std=c++11']
- if sys.platform.startswith('darwin'):
-     cpp_extra_compile_args.append("-stdlib=libc++")
-     cpp_extra_link_args = ["-O2", "-march=native", '-stdlib=libc++']
-@@ -189,4 +189,4 @@ setup(
-               'get_environment = pymatgen.cli.get_environment:main',
-           ]
-     }
--)
-\ No newline at end of file
-+)