diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0663922ec3a442debc179e0ec880dfcee75141f0..e6fe9fb4158871ba1f7326d0c44f02d02ed5dfe0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,20 +54,6 @@ stages: key: "linux-cache" -.build_macos_intel_template: - extends: .build_template - tags: - - bob - - macos - - intel - artifacts: - paths: - - ${CONDA_ROOT}/conda-bld/osx-64/*.conda - - ${CONDA_ROOT}/conda-bld/osx-64/*.tar.bz2 - cache: - key: "macos-intel-cache" - - .build_macos_arm_template: extends: .build_template tags: @@ -127,15 +113,6 @@ build_linux_bob_devtools: script: - python3 ./bob/devtools/build.py -vv build-devtools --twine-check -build_macos_intel_bob_devel: - extends: .build_macos_intel_template - # run bob-devel test only when bob/devtools/data/conda_build_config.yaml changes - only: - changes: - - bob/devtools/data/conda_build_config.yaml - script: - - python3 ./bob/devtools/build.py -vv build-bob-devel - build_macos_arm_bob_devel: extends: .build_macos_arm_template # run bob-devel test only when bob/devtools/data/conda_build_config.yaml changes @@ -145,15 +122,6 @@ build_macos_arm_bob_devel: script: - python3 ./bob/devtools/build.py -vv build-bob-devel -build_macos_intel_deps: - extends: .build_macos_intel_template - # run deps test only when deps changes - only: - changes: - - deps/**/* - script: - - python3 ./bob/devtools/build.py -vv build-deps - build_macos_arm_deps: extends: .build_macos_arm_template # run deps test only when deps changes @@ -163,11 +131,6 @@ build_macos_arm_deps: script: - python3 ./bob/devtools/build.py -vv build-deps -build_macos_intel_bob_devtools: - extends: .build_macos_intel_template - script: - - python3 ./bob/devtools/build.py -vv build-devtools - build_macos_arm_bob_devtools: extends: .build_macos_arm_template script: @@ -193,9 +156,6 @@ build_macos_arm_bob_devtools: - build_linux_bob_devel - build_linux_deps - build_linux_bob_devtools - - build_macos_intel_bob_devel - - build_macos_intel_deps - - build_macos_intel_bob_devtools - build_macos_arm_bob_devel - build_macos_arm_deps - build_macos_arm_bob_devtools diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index cd2a22a1c326bb596042f7c5a35ced387b2e58d9..905ab115d087828bc15d75cd6b38c99b5817713d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,17 +2,17 @@ # See https://pre-commit.com/hooks.html for more hooks repos: - repo: https://github.com/timothycrosley/isort - rev: 5.12.0 + rev: 5.13.2 hooks: - id: isort args: [--settings-path, "pyproject.toml"] - repo: https://github.com/psf/black - rev: 23.1.0 + rev: 24.4.2 hooks: - id: black exclude: bob/devtools/templates/setup.py - repo: https://github.com/pycqa/flake8 - rev: 6.0.0 + rev: 7.0.0 hooks: - id: flake8 exclude: | @@ -21,7 +21,7 @@ repos: deps/bob-devel/run_test.py )$ - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.6.0 hooks: - id: check-ast exclude: bob/devtools/templates/setup.py diff --git a/bob/devtools/bootstrap.py b/bob/devtools/bootstrap.py index 88e26641b50f70ff50d66d8e41bd5aef39bcf1a7..5f3125a0ecdeeac4f9e698757c01b451c33496ce 100644 --- a/bob/devtools/bootstrap.py +++ b/bob/devtools/bootstrap.py @@ -215,22 +215,22 @@ def ensure_miniconda_sh(): # WARNING: if you update this version, remember to update hashes below # AND our "mirror" in the internal webserver - path = "https://github.com/conda-forge/miniforge/releases/download/22.9.0-3/Mambaforge-22.9.0-3-%s-%s.sh" + path = "https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Mambaforge-24.3.0-0-%s-%s.sh" if platform.system().lower() == "darwin": # apple silicon system = "MacOSX" if platform.machine().lower() == "arm64": - sha256 = "eebe06970fec4cb1445bba106e65f57084b753d39766bf213edf4e02b14e27c1" + sha256 = "de7c7f229d05104de802f1f729a595736b08139c4ae59ba8ba0049050d63c98f" machine = "arm64" else: # intel - sha256 = "a3ccaf7b93b6f99bc2018f2a6f3cd95489940731f11fb9bf6adf1a44a7ba4e17" + sha256 = "5455900cf1298f21333b7c0d1ec159952e1ef5426563cc97eb7e42053d608afc" machine = "x86_64" else: system = "Linux" if platform.machine().lower() == "aarch64": # raspberry pi - sha256 = "bd9694b1558f4ee6c4eef081cefc57dbb32ceb6406e497018f0c7d2dab5b61dd" + sha256 = "7f2a0282819f1a12bb44628a836b96fe9dfb21a5920fb8331325c47f91bf9a81" machine = "aarch64" else: # intel - sha256 = "29f6374464307732c2c9d6711cdbca4d685c632f31e8bf1a5565276c65e0069b" + sha256 = "0be3654cc3b9c43d3aeeeca5efe6d2f31e9f7711702f3818529b367b3db677fb" machine = "x86_64" path = path % (system, machine) diff --git a/bob/devtools/data/gitlab-ci/single-package.yaml b/bob/devtools/data/gitlab-ci/single-package.yaml index 772b77bdc0fea860d1a1f1856e1dbe482b81788c..9dbdb018e70d244a264aa130dfe03836663d8ecd 100644 --- a/bob/devtools/data/gitlab-ci/single-package.yaml +++ b/bob/devtools/data/gitlab-ci/single-package.yaml @@ -129,6 +129,7 @@ build_linux_310: # Deploy targets .deploy_template: extends: .bootstrap + image: quay.io/condaforge/linux-anvil-cos7-x86_64 stage: deploy script: - git config --global --add safe.directory ${CI_PROJECT_DIR} @@ -165,6 +166,7 @@ deploy_stable: pypi: extends: .bootstrap + image: quay.io/condaforge/linux-anvil-cos7-x86_64 stage: pypi environment: pypi only: diff --git a/bob/devtools/scripts/dependencies.py b/bob/devtools/scripts/dependencies.py index ec077b1e59695fd5c960e0c87d1bbeb3f69a85f8..564aaf9fc15b8fd5acfb4e36453562202d82b487 100644 --- a/bob/devtools/scripts/dependencies.py +++ b/bob/devtools/scripts/dependencies.py @@ -1,4 +1,5 @@ """Create an environment with all external dependencies listed in bob/devtools/data/conda_build_config.yaml""" + import click