From 3feab422034627324bf3d1a2dabd4861cc61d3f9 Mon Sep 17 00:00:00 2001 From: Tamara Dahlgren <35777542+tldahlgren@users.noreply.github.com> Date: Thu, 30 Sep 2021 19:13:26 -0700 Subject: py-setuptools-rust: remove checksum url workaround (#25843) --- .../repos/builtin/packages/py-setuptools-rust/package.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-setuptools-rust/package.py b/var/spack/repos/builtin/packages/py-setuptools-rust/package.py index 868bc5007a..f613e77184 100644 --- a/var/spack/repos/builtin/packages/py-setuptools-rust/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools-rust/package.py @@ -13,11 +13,10 @@ class PySetuptoolsRust(PythonPackage): pypi = "setuptools-rust/setuptools-rust-0.12.1.tar.gz" version('0.12.1', sha256='647009e924f0ae439c7f3e0141a184a69ad247ecb9044c511dabde232d3d570e') + # Version 0.10.6 is not available on pypi and can only be found on github version('0.10.6', sha256='1446d3985e4aaf4cc679fda8a48a73ac1390b627c8ae1bebe7d9e08bb3b33769', - # version specific url is not used here because spack checksum would - # use it instead of pypi (see #24668) - # url="https://github.com/PyO3/setuptools-rust/archive/v0.10.6.tar.gz", + url="https://github.com/PyO3/setuptools-rust/archive/v0.10.6.tar.gz", deprecated=True) depends_on('python@3.6:', when='@0.12:', type=('build', 'run')) @@ -27,11 +26,3 @@ class PySetuptoolsRust(PythonPackage): depends_on('py-semantic-version@2.6.0:', type=('build', 'run')) depends_on('py-toml@0.9.0:', type=('build', 'run')) depends_on('rust', type='run') - - # when #24668 is fixed remove url_for_version and use url= (see above) for - # version 0.10.6 - def url_for_version(self, version): - if version >= Version('0.12.0'): - return 'https://files.pythonhosted.org/packages/source/s/setuptools-rust/setuptools-rust-{0}.tar.gz'.format(version) - else: - return 'https://github.com/PyO3/setuptools-rust/archive/v{0}.tar.gz'.format(version) -- cgit v1.2.3-60-g2f50