diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 875d996..3db01d7 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,8 +8,20 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_: - CONFIG: linux_64_ + linux_64_python3.10.____cpython: + CONFIG: linux_64_python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_python3.11.____cpython: + CONFIG: linux_64_python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_python3.12.____cpython: + CONFIG: linux_64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_python3.9.____cpython: + CONFIG: linux_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 215eeeb..6c6bd90 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,8 +8,17 @@ jobs: vmImage: macOS-13 strategy: matrix: - osx_64_: - CONFIG: osx_64_ + osx_64_python3.10.____cpython: + CONFIG: osx_64_python3.10.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_python3.11.____cpython: + CONFIG: osx_64_python3.11.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_python3.12.____cpython: + CONFIG: osx_64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_python3.9.____cpython: + CONFIG: osx_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 9901917..8a6d3fd 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,8 +8,17 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_: - CONFIG: win_64_ + win_64_python3.10.____cpython: + CONFIG: win_64_python3.10.____cpython + UPLOAD_PACKAGES: 'True' + win_64_python3.11.____cpython: + CONFIG: win_64_python3.11.____cpython + UPLOAD_PACKAGES: 'True' + win_64_python3.12.____cpython: + CONFIG: win_64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' + win_64_python3.9.____cpython: + CONFIG: win_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml new file mode 100644 index 0000000..d740921 --- /dev/null +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -0,0 +1,16 @@ +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +python_min: +- '3.9' diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml new file mode 100644 index 0000000..e6d6bbb --- /dev/null +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -0,0 +1,16 @@ +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +python_min: +- '3.9' diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml new file mode 100644 index 0000000..b4ff262 --- /dev/null +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -0,0 +1,16 @@ +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_min: +- '3.9' diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml similarity index 53% rename from .ci_support/linux_64_.yaml rename to .ci_support/linux_64_python3.9.____cpython.yaml index 82f2873..69ea38a 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -1,8 +1,16 @@ cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +python_min: +- '3.9' diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml new file mode 100644 index 0000000..04656ca --- /dev/null +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -0,0 +1,18 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +python_min: +- '3.9' diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml new file mode 100644 index 0000000..a0e6184 --- /dev/null +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -0,0 +1,18 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +python_min: +- '3.9' diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml new file mode 100644 index 0000000..c5f7b92 --- /dev/null +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -0,0 +1,18 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_min: +- '3.9' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml similarity index 61% rename from .ci_support/osx_64_.yaml rename to .ci_support/osx_64_python3.9.____cpython.yaml index 26fe68d..15c3dc9 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -8,3 +8,11 @@ channel_targets: - conda-forge main macos_machine: - x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +python_min: +- '3.9' diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml deleted file mode 100644 index c2135b0..0000000 --- a/.ci_support/win_64_.yaml +++ /dev/null @@ -1,4 +0,0 @@ -channel_sources: -- conda-forge -channel_targets: -- conda-forge main diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml new file mode 100644 index 0000000..c29720f --- /dev/null +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -0,0 +1,12 @@ +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +python_min: +- '3.9' diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml new file mode 100644 index 0000000..a4ddf66 --- /dev/null +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -0,0 +1,12 @@ +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +python_min: +- '3.9' diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml new file mode 100644 index 0000000..97bd0d9 --- /dev/null +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -0,0 +1,12 @@ +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_min: +- '3.9' diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml new file mode 100644 index 0000000..41e0a9c --- /dev/null +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -0,0 +1,12 @@ +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +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..e2fd9f7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,16 +1,16 @@ {% set name = "conda-store" %} -{% set version = "2024.10.1" %} +{% set version = "2024.11.1" %} package: name: {{ name|lower }}-split version: {{ version }} source: - - url: https://pypi.io/packages/source/c/conda-store/conda_store-{{ version }}.tar.gz - sha256: 2b2c5039776d299f14af48739701def9bfc3764f67f1b7335ae9f9d88cc52fc0 + - url: https://pypi.org/packages/source/c/conda-store/conda_store-{{ version }}.tar.gz + sha256: 82205d1056d16b3ff770c4debc155c29d384a55a087f26328e329812d7e6ead9 folder: conda-store - - url: https://pypi.io/packages/source/c/conda-store-server/conda_store_server-{{ version }}.tar.gz - sha256: 61451e3893e8a109d7015dbedc4748691f59c11357f92ab2face5c0e66eef760 + - url: https://pypi.org/packages/source/c/conda-store-server/conda_store_server-{{ version }}.tar.gz + sha256: 753b18b99e426c5e2e551a5a0b8ae560fbbc1bd60ee28d59de08e5aea2c6c624 folder: conda-store-server build: @@ -23,10 +23,10 @@ outputs: noarch: python script: python -m pip install ./conda-store -vv --no-deps --no-build-isolation --no-index entry_points: - - conda-store = conda_store.__main__:main + - conda-store = conda_store.__main__:main requirements: host: - - python >=3.8 + - python {{ python_min }} - pip - hatchling >=1.14.0 - hatch-vcs @@ -36,7 +36,7 @@ outputs: - __win # [win] - aiohttp >=3.8.1 - click - - python >=3.8 + - python >={{ python_min }} - rich - ruamel.yaml - yarl @@ -55,11 +55,11 @@ outputs: noarch: python script: python -m pip install ./conda-store-server -vv --no-deps --no-build-isolation --no-index entry_points: - - conda-store-server = conda_store_server._internal.server.__main__:main - - conda-store-worker = conda_store_server._internal.worker.__main__:main + - conda-store-server = conda_store_server._internal.server.__main__:main + - 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,10 +81,10 @@ outputs: - minio - pydantic <2.0a0 - pyjwt - - python >=3.8 + - python >={{ python_min }} - python-docker - python-multipart - - pyyaml + - pyyaml <=5.3.1 - redis-py - requests - sqlalchemy <2.0a0