Merge remote-tracking branch 'upstream/main' into jiwaszki/np_unique_…

…nan_bug

.cirrus.star

@@ -16,8 +16,9 @@ def main(ctx):
     if env.get("CIRRUS_REPO_FULL_NAME") != "numpy/numpy":
         return []
 
-    # if env.get("CIRRUS_CRON", "") == "nightly":
-    #     return fs.read("ci/cirrus_wheels.yml")
+    # only run the wheels entry on a cron job
+    if env.get("CIRRUS_CRON", "") == "nightly":
+        return fs.read("tools/ci/cirrus_wheels.yml")
 
     # Obtain commit message for the event. Unfortunately CIRRUS_CHANGE_MESSAGE
     # only contains the actual commit message on a non-PR trigger event.
@@ -31,8 +32,8 @@ def main(ctx):
     if "[skip cirrus]" in dct["message"] or "[skip ci]" in dct["message"]:
         return []
 
-    config =  fs.read("tools/ci/cirrus_general.yml")
-
     # add extra jobs to the cirrus run by += adding to config
+    config = fs.read("tools/ci/cirrus_wheels.yml")
+    config += fs.read("tools/ci/cirrus_macosx_arm64.yml")
 
     return config

.devcontainer/devcontainer.json

@@ -1,9 +1,4 @@
 {
-	// Conda requires lots of memory to resolve our environment
-	"hostRequirements": {
-		"memory": "8gb"
-	},
-
 	// More info about Features: https://containers.dev/features
 	"image": "mcr.microsoft.com/devcontainers/universal:2",
 	"features": {},

.devcontainer/setup.sh

@@ -2,7 +2,12 @@
 
 set -e
 
+curl micro.mamba.pm/install.sh | bash
+
 conda init --all
-conda env create -f environment.yml
+micromamba shell init -s bash
+micromamba env create -f environment.yml --yes
+# Note that `micromamba activate numpy-dev` doesn't work, it must be run by the
+# user (same applies to `conda activate`)
 
 git submodule update --init

.github/dependabot.yml

@@ -4,8 +4,7 @@ updates:
     directory: /
     schedule:
       interval: daily
-
-  - package-ecosystem: docker
-    directory: /tools/gitpod
-    schedule:
-      interval: daily
+    commit-message:
+      prefix: "MAINT"
+    labels:
+      - "03 - Maintenance"