conda 23.3.0 with dependency updates (#202)

* updated v23.3.0 * Add missing dependencies * Add version constraints. * Add a patch * Work around another libsolv issue shortly Should be removed once conda/conda-build#4750 is fixed for good. --------- Co-authored-by: regro-cf-autotick-bot <[email protected]> Co-authored-by: Jannis Leidel <[email protected]> Co-authored-by: jaimergp <[email protected]> Co-authored-by: conda-forge-webservices[bot] <91080706+conda-forge-webservices[bot]@users.noreply.github.com>
conda-forge · Mar 28, 2023 · b3c7d5e · b3c7d5e
1 parent 59c6e83
commit b3c7d5e
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 13 deletions.
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/README.md b/README.md
diff --git a/conda-forge.yml b/conda-forge.yml
@@ -12,3 +12,4 @@ provider:
 test_on_native_only: true
 conda_build:
   pkg_format: '2'
+remote_ci_setup: ["conda-forge-ci-setup=3", "libsolv<0.7.23"]  # https://github.com/conda/conda-build/issues/4750
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -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" %}
@@ -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
@@ -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
@@ -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

diff --git a/recipe/patches/01-deprecations-version-fallback.patch b/recipe/patches/01-deprecations-version-fallback.patch
@@ -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,