Cleanup

pyproject.toml

@@ -5,6 +5,31 @@
 requires = ["setuptools", "wheel"]
 build-backend = "setuptools.build_meta"
 
+[project]
+name = "relenv"
+dynamic = ["version", "readme"]
+
+[project.urls]
+"Source Code" = "https://github.com/saltstack/relative-environment-for-python"
+Documentation = "https://relenv.readthedocs.io/en/latest/"
+Changelog = "https://relenv.readthedocs.io/en/latest/changelog.html"
+
+[project.scripts]
+relenv = "relenv.__main__:main"
+
+[project.optional-dependencies]
+toolchain = ["ppbt"]
+
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.dynamic]
+version = {attr = "relenv.common.__version__"}
+readme = {file = "README.md", content-type = "text/markdown"}
+
+[tool.setuptools.packages.find]
+include = ["relenv*", "tests*"]
+
 [tool.pytest.ini_options]
 minversion = "6.0"
 testpaths = [

relenv/build/common/builder.py

@@ -26,7 +26,6 @@
     DATA_DIR,
     MODULE_DIR,
     ConfigurationError,
-    Version,
     WorkDirs,
     build_arch,
     extract_archive,
@@ -279,35 +278,6 @@ def __init__(
         self.version = version
         self.set_arch(self.arch)
 
-    def copy(self, version: str, checksum: str | None) -> Builder:
-        """Create a copy of this Builder with a different version."""
-        recipies: dict[str, Recipe] = {}
-        for name in self.recipies:
-            recipe = self.recipies[name]
-            recipies[name] = {
-                "build_func": recipe["build_func"],
-                "wait_on": list(recipe["wait_on"]),
-                "download": recipe["download"].copy() if recipe["download"] else None,
-            }
-        build = Builder(
-            self.root,
-            recipies,
-            self.build_default,
-            self.populate_env,
-            self.arch,
-            version,
-        )
-        python_download = build.recipies["python"].get("download")
-        if python_download is None:
-            raise ConfigurationError("Python recipe is missing a download entry")
-        python_download.version = version
-        if checksum is None:
-            from relenv.pyversions import python_versions
-
-            checksum = python_versions().get(Version(version))
-        python_download.checksum = checksum
-        return build
-
     def set_arch(self, arch: str) -> None:
         """
         Set the architecture for the build.

tests/test_verify_build.py

@@ -1124,7 +1124,7 @@ def test_install_pycurl(pipexec, pyexec, build):
     buildscript = textwrap.dedent(
         """\
     set -e
-    wget https://curl.se/download/curl-{curlver}.tar.gz
+    wget --tries=10 --retry-connrefused --waitretry=10 --timeout=30 https://curl.se/download/curl-{curlver}.tar.gz
     tar xvf curl-{curlver}.tar.gz
     cd curl-{curlver}
     source <({build}/bin/relenv buildenv)
@@ -1220,7 +1220,7 @@ def test_install_libgit2(pipexec, build, minor_version, build_dir, versions):
     source <({build}/bin/relenv buildenv)
 
     # Build and install libssh2
-    wget https://www.libssh2.org/download/libssh2-{libssh2}.tar.gz
+    wget --tries=10 --retry-connrefused --waitretry=10 --timeout=30 https://www.libssh2.org/download/libssh2-{libssh2}.tar.gz
     tar xvf libssh2-{libssh2}.tar.gz
     cd libssh2-{libssh2}
     mkdir bin
@@ -1238,7 +1238,7 @@ def test_install_libgit2(pipexec, build, minor_version, build_dir, versions):
     cd ../..
 
     # Build and install libgit2
-    wget https://github.com/libgit2/libgit2/archive/refs/tags/v{libgit2}.tar.gz
+    wget --tries=10 --retry-connrefused --waitretry=10 --timeout=30 https://github.com/libgit2/libgit2/archive/refs/tags/v{libgit2}.tar.gz
     tar xvf v{libgit2}.tar.gz
     cd libgit2-{libgit2}
     mkdir build
@@ -1294,7 +1294,7 @@ def test_install_python_ldap(pipexec, pyexec, build):
     source <({build}/bin/relenv buildenv)
 
     # Build and Install sasl
-    wget https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-{saslver}/cyrus-sasl-{saslver}.tar.gz
+    wget --tries=10 --retry-connrefused --waitretry=10 --timeout=30 https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-{saslver}/cyrus-sasl-{saslver}.tar.gz
     tar xvf cyrus-sasl-{saslver}.tar.gz
     cd cyrus-sasl-{saslver}
     ./configure --prefix=$RELENV_PATH
@@ -1303,7 +1303,7 @@ def test_install_python_ldap(pipexec, pyexec, build):
     cd ..
 
     # Build and Install Open LDAP
-    wget https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-{ldapver}.tgz
+    wget --tries=10 --retry-connrefused --waitretry=10 --timeout=30 https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-{ldapver}.tgz
     tar xvf openldap-{ldapver}.tgz
     cd openldap-{ldapver}
     ./configure --prefix=$RELENV_PATH