python3-networkx: Update to 3.1, rename source package

This renames the source package to python-networkx to match other Python
packages.

This also updates the list of dependencies.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>

diff --git a/lang/python/python-networkx/Makefile b/lang/python/python-networkx/Makefile
new file mode 100644 (file)
index 0000000..d0ea86c
--- /dev/null
+++ b/lang/python/python-networkx/Makefile
@@ -0,0 +1,39 @@
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=python-networkx
+PKG_VERSION:=3.1
+PKG_RELEASE:=1
+
+PYPI_NAME:=networkx
+PKG_HASH:=de346335408f84de0eada6ff9fafafff9bcda11f0a0dfaa931133debb146ab61
+
+PKG_LICENSE:=BSD-3-clause
+PKG_LICENSE_FILES:=LICENSE.txt
+PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
+
+include ../pypi.mk
+include $(INCLUDE_DIR)/package.mk
+include ../python3-package.mk
+
+define Package/python3-networkx
+  SECTION:=lang
+  CATEGORY:=Languages
+  SUBMENU:=Python
+  TITLE:=Creating and manipulating graphs and networks
+  URL:=https://networkx.org/
+  DEPENDS:=+python3-light +python3-uuid +python3-xml
+endef
+
+define Package/python3-networkx/description
+NetworkX is a Python package for the creation, manipulation, and study
+of the structure, dynamics, and functions of complex networks.
+endef
+
+$(eval $(call Py3Package,python3-networkx))
+$(eval $(call BuildPackage,python3-networkx))
+$(eval $(call BuildPackage,python3-networkx-src))

diff --git a/lang/python/python3-networkx/Makefile b/lang/python/python3-networkx/Makefile
deleted file mode 100644 (file)
index e4d7530..0000000
--- a/lang/python/python3-networkx/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=python3-networkx
-PKG_VERSION:=2.8.8
-PKG_RELEASE:=1
-
-PYPI_NAME:=networkx
-PKG_HASH:=230d388117af870fce5647a3c52401fcf753e94720e6ea6b4197a5355648885e
-
-PKG_LICENSE:=BSD-3-clause
-PKG_LICENSE_FILES:=LICENSE.txt
-PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-
-include ../pypi.mk
-include $(INCLUDE_DIR)/package.mk
-include ../python3-package.mk
-
-define Package/python3-networkx
-  SECTION:=lang
-  CATEGORY:=Languages
-  SUBMENU:=Python
-  TITLE:=Creating and manipulating graphs and networks
-  URL:=https://networkx.github.io/
-  DEPENDS:=+python3-light +python3-decorator
-endef
-
-define Package/python3-networkx/description
-NetworkX is a Python package for the creation, manipulation, and study
-of the structure, dynamics, and functions of complex networks.
-endef
-
-$(eval $(call Py3Package,python3-networkx))
-$(eval $(call BuildPackage,python3-networkx))
-$(eval $(call BuildPackage,python3-networkx-src))