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.

Sign up for GitHub

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

Enforce system requirements, upgrade to conda 24.7.1, mamba 1.5.9, bump Docker image for linux-64 #626

Merged
merged 12 commits into from
Sep 3, 2024
Merged

Enforce system requirements, upgrade to conda 24.7.1, mamba 1.5.9, bump Docker image for linux-64 #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f0a9778
Require glibc 2.17 and macOS 10.13, minimum
jaimergp Aug 14, 2024
1054802
Bump to conda-libmamba-solver 24.7.1, conda-libmamba-solver 24.7
jaimergp Aug 14, 2024
2617fbb
tmp: patch constructor
jaimergp Aug 14, 2024
8f93f75
SETUPTOOLS_SCM_PRETEND_VERSION
jaimergp Aug 14, 2024
d6455ff
retrigger
jaimergp Aug 14, 2024
8b6e1fb
mambaforge deprecation warnings only for mambaforge
jaimergp Aug 14, 2024
829829e
Require constructor 3.9.3
jaimergp Aug 20, 2024
0743f03
Merge branch 'main' into system-requirements-and-conda-24.7.1
jaimergp Aug 29, 2024
ff0f933
Update mamba version
hmaarrfk Aug 31, 2024
0a3fb69
update micromamba version
hmaarrfk Aug 31, 2024
eacad1a
Update construct.yaml
hmaarrfk Aug 31, 2024
e6c7e90
Bump Docker image?
jaimergp Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,15 @@ jobs:
ARCH: x86_64
TARGET_PLATFORM: linux-64
DOCKER_ARCH: amd64
DOCKERIMAGE: condaforge/linux-anvil-comp7
DOCKERIMAGE: condaforge/linux-anvil-cos7-x86_64
MINIFORGE_NAME: "Miniforge3"
OS_NAME: "Linux"

- os: ubuntu-latest
ARCH: x86_64
TARGET_PLATFORM: linux-64
DOCKER_ARCH: amd64
DOCKERIMAGE: condaforge/linux-anvil-comp7
DOCKERIMAGE: condaforge/linux-anvil-cos7-x86_64
MINIFORGE_NAME: "Mambaforge"
OS_NAME: "Linux"

Expand Down Expand Up @@ -152,15 +152,15 @@ jobs:
ARCH: x86_64
TARGET_PLATFORM: linux-64
DOCKER_ARCH: amd64
DOCKERIMAGE: condaforge/linux-anvil-comp7
DOCKERIMAGE: condaforge/linux-anvil-cos7-x86_64
MINIFORGE_NAME: "Miniforge-pypy3"
OS_NAME: "Linux"

- os: ubuntu-latest
ARCH: x86_64
TARGET_PLATFORM: linux-64
DOCKER_ARCH: amd64
DOCKERIMAGE: condaforge/linux-anvil-comp7
DOCKERIMAGE: condaforge/linux-anvil-cos7-x86_64
MINIFORGE_NAME: "Mambaforge-pypy3"
OS_NAME: "Linux"

Expand Down
14 changes: 11 additions & 3 deletions Miniforge3/construct.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{% set name = os.environ.get("MINIFORGE_NAME", "Miniforge3") %}
{% set version = os.environ.get("MINIFORGE_VERSION", "24.5.0-0") %}
{% set conda_libmamba_solver_version = "24.1.0"%}
{% set mamba_version = "1.5.8"%}
{% set version = os.environ.get("MINIFORGE_VERSION", "24.7.1-0") %}
{% set conda_libmamba_solver_version = "24.7.0"%}
# when mamba_version is updated here, also update MICROMAMBA_VERSION
# in scripts/build.sh
{% set mamba_version = "1.5.9"%}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is also the MICROMAMBA_VERSION=1.5.8 in https://github.com/jaimergp/miniforge/blob/system-requirements-and-conda-24.7.1/scripts/build.sh#L41
If I recall correctly they are usually upgraded together

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks its often forgotten.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New micromamba requires the newer image for a more recent GLIBC, it looks like, so I bumped the image for x64 which was still using 2.12 IIRC.


name: {{ name }}
version: {{ version }}
Expand Down Expand Up @@ -49,5 +51,11 @@ specs:
- pip
- miniforge_console_shortcut 1.* # [win]

{% if name.startswith("Mambaforge") %}
pre_install: mambaforge_deprecation.sh # [unix]
pre_install: mambaforge_deprecation.bat # [win]
{% endif %}
hmaarrfk marked this conversation as resolved.
Show resolved Hide resolved

virtual_specs:
- __glibc >=2.17 # [linux]
- __osx >=10.13 # [osx]
4 changes: 2 additions & 2 deletions scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ echo "***** Install constructor *****"
mamba install --yes \
--channel conda-forge --override-channels \
jinja2 curl libarchive \
"constructor>=3.4.5"
"constructor>=3.9.3"

if [[ "$(uname)" == "Darwin" ]]; then
mamba install --yes \
Expand All @@ -38,7 +38,7 @@ cp LICENSE "${TEMP_DIR}/"
ls -al "${TEMP_DIR}"

if [[ "${TARGET_PLATFORM}" != win-* ]]; then
MICROMAMBA_VERSION=1.5.8
MICROMAMBA_VERSION=1.5.9
MICROMAMBA_BUILD=0
mkdir "${TEMP_DIR}/micromamba"
pushd "${TEMP_DIR}/micromamba"
Expand Down
Loading