Skip to content

Commit

Permalink
Merge pull request #208 from beeankha/23.5.0_h2739ac
Browse files Browse the repository at this point in the history
  • Loading branch information
jezdez authored May 25, 2023
2 parents f64a27d + 004819f commit 4206ae1
Show file tree
Hide file tree
Showing 11 changed files with 43 additions and 213 deletions.
6 changes: 5 additions & 1 deletion README.md

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

15 changes: 0 additions & 15 deletions recipe/bld.bat

This file was deleted.

28 changes: 0 additions & 28 deletions recipe/build.sh

This file was deleted.

45 changes: 0 additions & 45 deletions recipe/commands_to_test.bat

This file was deleted.

36 changes: 0 additions & 36 deletions recipe/commands_to_test.sh

This file was deleted.

29 changes: 14 additions & 15 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.3.1" %}
{% set sha256 = "f0203ae42a8a360170e8aebd45e42b6c8bf283d44b9016ef4b30451c0b55c8dc" %}
{% set version = "23.5.0" %}
{% set sha256 = "57155b96dd94ba95e421b4c36695dbf6972bcfb9b5e41ee0674bb796b8386f58" %}
# 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,11 +14,10 @@ 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
script: {{ PYTHON }} -m pip install . --no-deps --no-build-isolation -vv && {{ PYTHON }} -m conda init --install
# These are present when the new environment is created
# so we have to exempt them from the list of initial files
# for conda-build to realize they should be included.
Expand All @@ -40,15 +39,14 @@ requirements:
host:
- python
- conda-package-handling >=1.3.0
- menuinst >=1.4.11,<2 # [win]
- packaging >=23.0
- pip
- hatchling >=1.12.2
- hatch-vcs >=0.2.0
# for `conda init` in build/script above
- 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
- menuinst >=1.4.11,<2 # [win]
run:
- python
- conda-package-handling >=1.3.0
Expand Down Expand Up @@ -97,17 +95,18 @@ test:
- commands_to_test.sh # [unix]
downstreams:
- conda-smithy # [python_impl == "cpython" and py<311]
commands:
- env run_pytest={{ run_pytest }} bash test_runner.sh # [unix]
- set run_pytest={{ run_pytest }} && .\test_runner.bat # [win]

about:
home: https://conda.io
license: BSD-3-Clause
license_file: LICENSE.txt
license_file: LICENSE
summary: OS-agnostic, system-level binary package and environment manager.
description: >
Conda is an open source package management system and environment management system for installing multiple versions of software packages and their dependencies and switching easily between them. It works on Linux, OS X and Windows, and was created for Python programs but can package and distribute any software.
description: |
Conda is an open source package management system and environment
management system for installing multiple versions of software packages
and their dependencies and switching easily between them. It works on
Linux, OS X and Windows, and was created for Python programs but can
package and distribute any software.
doc_url: https://docs.conda.io/projects/conda/en/stable/
dev_url: https://github.com/conda/conda

Expand Down
16 changes: 0 additions & 16 deletions recipe/patches/01-deprecations-version-fallback.patch

This file was deleted.

Empty file added recipe/run_test.bat
Empty file.
24 changes: 24 additions & 0 deletions recipe/run_test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/usr/bin/env bash

# clear conda stuff from parent process
unset CONDA_SHLVL
unset _CE_CONDA
unset _CE_M
unset CONDA_EXE

# load shell interface
eval "$(python -m conda shell.bash hook)"

# display conda details
conda info --all

# create, activate, and deactivate a conda environment
conda create --yes --prefix "./built-conda-test-env" "patch" || exit 1

conda activate "./built-conda-test-env"
echo "CONDA_PREFIX=${CONDA_PREFIX}"

[[ "${CONDA_PREFIX}" == "${PWD}/built-conda-test-env" ]] || exit 1
${CONDA_PREFIX}/bin/patch --version || exit 1

conda deactivate
35 changes: 0 additions & 35 deletions recipe/test_runner.bat

This file was deleted.

22 changes: 0 additions & 22 deletions recipe/test_runner.sh

This file was deleted.

0 comments on commit 4206ae1

Please sign in to comment.