Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 0 additions & 59 deletions bioconda_utils/autobump.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,8 @@
import networkx as nx
from bioconda_utils.skiplist import Skiplist

import conda_build.variants
import conda_build.config
from conda.exports import MatchSpec, VersionOrder
import conda.exceptions

from packaging.version import parse as _pep440_parse, InvalidVersion, Version

Expand Down Expand Up @@ -580,12 +578,6 @@ class Metapackage(EndProcessingItem):

template = "builds a meta package (recipe has no sources)"

class UpToDate(EndProcessingItem):
"""This recipe appears to be up to date!"""

template = "is up to date"
level = logging.DEBUG

class UpdateVersionFailure(EndProcessingItem):
"""This recipe did not show the expected version number after updating.

Expand Down Expand Up @@ -660,7 +652,6 @@ async def apply(self, recipe: Recipe) -> None:

# scan for available versions
versions = await self.get_version_map(recipe)
# (too slow) conflicts = self.check_version_pin_conflict(recipe, versions)

# select apropriate most current version
latest = self.select_version(recipe.version, versions.keys())
Expand Down Expand Up @@ -801,56 +792,6 @@ def select_version(current: str, versions: Iterable[str]) -> str:

return latest

def check_version_pin_conflict(
self, recipe: Recipe, versions: dict[str, Any]
) -> None:
"""Find items in **versions** conflicting with pins

Example:
If ggplot 7.0 needs r-base 4.0, but our pin is 3.5.1, it conflicts

TODO: currently, this only logs an error
"""
variants = conda_build.variants.get_package_variants(
recipe.path, self.build_config
)

def check_pins(depends):
for pkg, spec in depends:
norm_pkg = pkg.replace("-", "_")
try:
mspec = MatchSpec(version=spec.replace(" ", ""))
except conda.exceptions.InvalidVersionSpec:
logger.error(
"Recipe %s: invalid upstream spec %s %s",
recipe,
pkg,
repr(spec),
)
continue
if norm_pkg in variants[0]:
for variant in variants:
if not mspec.match(
{
"name": "",
"build": "",
"build_number": "0",
"version": variant[norm_pkg],
}
):
logger.error(
"Recipe %s: %s %s conflicts pins",
recipe,
pkg,
spec,
)

for files in versions.values():
for data in files.values():
depends = data.get("depends")
if depends:
check_pins(depends.items())


class FetchUpstreamDependencies(Filter):
"""Fetch additional upstream dependencies (PyPi)
Expand Down
23 changes: 0 additions & 23 deletions bioconda_utils/bioconductor_skeleton.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,13 +204,6 @@ def latest_bioconductor_release_version():
return bioconductor_versions()[1]


def latest_bioconductor_devel_version():
"""
Latest Bioconductor version in development.
"""
return bioconductor_versions()[0]


def bioconductor_tarball_url(package, pkg_version, bioc_version):
"""
Constructs a url for a package tarball
Expand Down Expand Up @@ -477,17 +470,13 @@ def __init__(
self.base_url = base_url
self.package = package
self.package_lower = package.lower()
self._md5 = None
self._cached_tarball = None
self._dependencies = None
self.build_number = 0
self.bioc_version = bioc_version or ""
self._pkg_version = pkg_version
self._auto = bioc_version is None
self._cargoport_url = None
self._bioarchive_url = None
self._tarball_url = None
self._bioconductor_tarball_url = None
self.is_data_package = False
self.package_lower = package.lower()
self.version = pkg_version or ""
Expand Down Expand Up @@ -517,8 +506,6 @@ def __init__(

if not pkg_version:
self.version = self.packages[package]["Version"]
self.depends_on_gcc = False

# Determine the URL
url = os.path.join(
base_url,
Expand Down Expand Up @@ -730,16 +717,6 @@ def imports(self):
except KeyError:
return []

@property
def systemrequirements(self):
"""
List of "SystemRequirements" from the VIEW file
"""
try:
return self.packages[self.package]["SystemRequirements"]
except KeyError:
return []

@property
def depends(self):
"""
Expand Down
Loading
Loading