From f0ef0ceb341fa3f35b4ca1d06f62fa9d94343bd7 Mon Sep 17 00:00:00 2001 From: Manuela Kuhn <36827019+manuelakuhn@users.noreply.github.com> Date: Tue, 11 Jul 2023 04:19:15 +0200 Subject: [PATCH] py-gluoncv: switch to PyPI and add 0.10.5.post0 (#38814) * py-gluoncv: switch to PyPI and add 0.10.5.post0 * Fix style * Remove no-unicode-readme.patch --- .../builtin/packages/py-autocfg/package.py | 18 ++++++++++++++++++ .../py-gluoncv/no-unicode-readme.patch | 11 ----------- .../builtin/packages/py-gluoncv/package.py | 19 +++++++++++-------- 3 files changed, 29 insertions(+), 19 deletions(-) create mode 100644 var/spack/repos/builtin/packages/py-autocfg/package.py delete mode 100644 var/spack/repos/builtin/packages/py-gluoncv/no-unicode-readme.patch diff --git a/var/spack/repos/builtin/packages/py-autocfg/package.py b/var/spack/repos/builtin/packages/py-autocfg/package.py new file mode 100644 index 0000000000..d941c89b93 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-autocfg/package.py @@ -0,0 +1,18 @@ +# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyAutocfg(PythonPackage): + """Deep learning configuration.""" + + homepage = "https://github.com/zhreshold/autocfg" + pypi = "autocfg/autocfg-0.0.8.tar.gz" + + version("0.0.8", sha256="749986b4f3b3bd85b15298734bf8fa4a590e6c34a314ac515025e058ed76c319") + + depends_on("py-setuptools", type="build") + depends_on("py-pyyaml", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-gluoncv/no-unicode-readme.patch b/var/spack/repos/builtin/packages/py-gluoncv/no-unicode-readme.patch deleted file mode 100644 index 43d0a6c5e8..0000000000 --- a/var/spack/repos/builtin/packages/py-gluoncv/no-unicode-readme.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/README.md 2020-04-03 11:56:41.820271316 -0400 -+++ b/README.md 2020-04-03 11:56:55.901335611 -0400 -@@ -72,7 +72,7 @@ - - There are multiple versions of MXNet pre-built package available. Please refer to [mxnet packages](https://gluon-crash-course.mxnet.io/mxnet_packages.html) if you need more details about MXNet versions. - --# Docs 📖 -+# Docs - GluonCV documentation is available at [our website](https://gluon-cv.mxnet.io/index.html). - - # Examples diff --git a/var/spack/repos/builtin/packages/py-gluoncv/package.py b/var/spack/repos/builtin/packages/py-gluoncv/package.py index d5bd60eb59..3099006c40 100644 --- a/var/spack/repos/builtin/packages/py-gluoncv/package.py +++ b/var/spack/repos/builtin/packages/py-gluoncv/package.py @@ -14,11 +14,16 @@ class PyGluoncv(PythonPackage): vision.""" homepage = "https://gluon-cv.mxnet.io/" - url = "https://github.com/dmlc/gluon-cv/archive/v0.6.0.tar.gz" + pypi = "gluoncv/gluoncv-0.6.0.tar.gz" + git = "https://github.com/dmlc/gluon-cv.git" - version("0.6.0", sha256="5ac89d73f34d02b2e60595a5cc35f46d0a69376567fae3a9518005dd89161305") + version( + "0.10.5.post0", sha256="4598b9612e8b459a5a14ebeffedefcdae4a5700302a91f9b99fc82e9b08928a5" + ) + version("0.6.0", sha256="313848b939c30e9e4c0040078421c02e32a350b8ebf2a966313fd893d7b3bdf6") depends_on("py-setuptools", type="build") + depends_on("py-numpy", type=("build", "run")) depends_on("py-tqdm", type=("build", "run")) depends_on("py-requests", type=("build", "run")) @@ -26,9 +31,7 @@ class PyGluoncv(PythonPackage): depends_on("py-portalocker", type=("build", "run")) depends_on("pil", type=("build", "run")) depends_on("py-scipy", type=("build", "run")) - depends_on("py-cython", type="build") - - patch("no-unicode-readme.patch") - - def install_options(self, spec, prefix): - return ["--with-cython"] + depends_on("py-yacs", when="@0.8:", type=("build", "run")) + depends_on("py-pandas", when="@0.9:", type=("build", "run")) + depends_on("py-pyyaml", when="@0.9:", type=("build", "run")) + depends_on("py-autocfg", when="@0.9:", type=("build", "run"))