Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

conda 23.3.0 with dependency updates #202

Merged
merged 11 commits into from
Mar 28, 2023
4 changes: 2 additions & 2 deletions .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% set on_win = SUBDIR in ('win-64', 'win-32') %}
{% set name = "conda" %}
{% set version = "23.1.0" %}
{% set sha256 = "ba417f2e77806be36ab99a7640262b263a2dc809398d9403ea5f6f8f14dcc1a8" %}
{% set version = "23.3.0" %}
{% set sha256 = "6e7d8e6247e51847fcf8b264ddfa8eeafc66891db351d5d660ea46c459c46684" %}
# Running pytest requires the inclusion of test files which baloons
# the size of the package; values can be "yes" or "no"
{% set run_pytest = "no" %}
Expand All @@ -14,6 +14,8 @@ source:
fn: conda-{{ version }}.tar.gz
url: https://github.com/conda/{{ name }}/archive/{{ version }}.tar.gz
sha256: {{ sha256 }}
patches:
- patches/01-deprecations-version-fallback.patch

build:
number: 0
Expand All @@ -35,21 +37,23 @@ requirements:
- m2-filesystem # [win]
- m2-bash # [win]
- m2-base # [win]

host:
- python
- conda-package-handling >=1.3.0
- menuinst >=1.4.11,<2 # [win]
- packaging >=23.0
- pip
- ruamel.yaml >=0.11.14,<0.18
- setuptools >=31.0.1
- toolz >=0.8.1
- pluggy >=1.0.0
- tqdm >=4
- boltons >=23.0.0
run:
- python
- conda-package-handling >=1.3.0
- menuinst >=1.4.11,<2 # [win]
- packaging >=23.0
- pycosat >=0.6.3
- pyopenssl >=16.2.0
- requests >=2.20.1,<3
Expand All @@ -58,6 +62,7 @@ requirements:
- toolz >=0.8.1
- pluggy >=1.0.0
- tqdm >=4
- boltons >=23.0.0
run_constrained:
- conda-build >=3
- conda-content-trust >=0.1.1
Expand Down
16 changes: 16 additions & 0 deletions recipe/patches/01-deprecations-version-fallback.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/conda/deprecations.py b/conda/deprecations.py
index 68ca1a7ad..c514fa7e1 100644
--- a/conda/deprecations.py
+++ b/conda/deprecations.py
@@ -25,8 +25,10 @@ class DeprecationHandler:

:param version: The version to compare against when checking deprecation statuses.
"""
- if not isinstance(version, Version):
+ try:
self._version = parse(version)
+ except TypeError:
+ self._version = parse("0.0.0.dev0+placeholder")

def __call__(
self,