diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 82f2873..8f94762 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,8 +1,10 @@ cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +python_min: +- '3.9' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 26fe68d..46fbb45 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -8,3 +8,5 @@ channel_targets: - conda-forge main macos_machine: - x86_64-apple-darwin13.4.0 +python_min: +- '3.9' diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index c2135b0..b859c66 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -2,3 +2,5 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +python_min: +- '3.9' diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index cc73c21..63147cc 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -33,7 +33,7 @@ rm -rf "${MAMBA_ROOT_PREFIX}" "${micromamba_exe}" || true ( endgroup "Provisioning base env with micromamba" ) 2> /dev/null ( startgroup "Configuring conda" ) 2> /dev/null - +echo "Activating environment" source "${MINIFORGE_HOME}/etc/profile.d/conda.sh" conda activate base export CONDA_SOLVER="libmamba" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 752eec6..cc0d2c4 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -12,6 +12,7 @@ setlocal enableextensions enabledelayedexpansion +FOR %%A IN ("%~dp0.") DO SET "REPO_ROOT=%%~dpA" if "%MINIFORGE_HOME%"=="" set "MINIFORGE_HOME=%USERPROFILE%\Miniforge3" :: Remove trailing backslash, if present if "%MINIFORGE_HOME:~-1%"=="\" set "MINIFORGE_HOME=%MINIFORGE_HOME:~0,-1%" @@ -32,17 +33,14 @@ call "%MICROMAMBA_EXE%" create --yes --root-prefix "%MAMBA_ROOT_PREFIX%" --prefi --channel conda-forge ^ pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" if !errorlevel! neq 0 exit /b !errorlevel! -echo Moving pkgs cache from %MAMBA_ROOT_PREFIX% to %MINIFORGE_HOME% -move /Y "%MAMBA_ROOT_PREFIX%\pkgs" "%MINIFORGE_HOME%" -if !errorlevel! neq 0 exit /b !errorlevel! echo Removing %MAMBA_ROOT_PREFIX% -del /S /Q "%MAMBA_ROOT_PREFIX%" -del /S /Q "%MICROMAMBA_TMPDIR%" -call :end_group +del /S /Q "%MAMBA_ROOT_PREFIX%" >nul +del /S /Q "%MICROMAMBA_TMPDIR%" >nul call :start_group "Configuring conda" :: Activate the base conda environment +echo Activating environment call "%MINIFORGE_HOME%\Scripts\activate.bat" :: Configure the solver set "CONDA_SOLVER=libmamba" diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 32da3d0..eff4ad6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,7 +19,7 @@ stages: echo "##vso[task.setvariable variable=log]$git_log" displayName: Obtain commit message - bash: echo "##vso[task.setvariable variable=RET]false" - condition: or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]')) + condition: and(eq(variables['Build.Reason'], 'PullRequest'), or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]'))) displayName: Skip build? - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" name: result diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 93b8fa2..ae4d7ff 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,20 +1,22 @@ {% set name = "conda-store" %} {% set version = "2024.10.1" %} +{% set python_min = "3.10" %} + package: name: {{ name|lower }}-split version: {{ version }} source: - - url: https://pypi.io/packages/source/c/conda-store/conda_store-{{ version }}.tar.gz + - url: https://pypi.org/packages/source/c/conda-store/conda_store-{{ version }}.tar.gz sha256: 2b2c5039776d299f14af48739701def9bfc3764f67f1b7335ae9f9d88cc52fc0 folder: conda-store - - url: https://pypi.io/packages/source/c/conda-store-server/conda_store_server-{{ version }}.tar.gz + - url: https://pypi.org/packages/source/c/conda-store-server/conda_store_server-{{ version }}.tar.gz sha256: 61451e3893e8a109d7015dbedc4748691f59c11357f92ab2face5c0e66eef760 folder: conda-store-server build: - number: 0 + number: 1 outputs: - name: conda-store @@ -26,7 +28,7 @@ outputs: - conda-store = conda_store.__main__:main requirements: host: - - python >=3.8 + - python {{ python_min }} - pip - hatchling >=1.14.0 - hatch-vcs @@ -36,7 +38,7 @@ outputs: - __win # [win] - aiohttp >=3.8.1 - click - - python >=3.8 + - python >={{ python_min }} - rich - ruamel.yaml - yarl @@ -59,7 +61,7 @@ outputs: - conda-store-worker = conda_store_server._internal.worker.__main__:main requirements: host: - - python >=3.8 + - python {{ python_min }} - pip - hatchling >=1.14.0 - hatch-vcs @@ -81,7 +83,7 @@ outputs: - minio - pydantic <2.0a0 - pyjwt - - python >=3.8 + - python >={{ python_min }} - python-docker - python-multipart - pyyaml