Merge branch 'ci-remove-macpro' into 'master'

Remove macpro from noarch/single-package/nightlies

See merge request !345

bob/devtools/data/gitlab-ci/nightlies.yaml

@@ -71,27 +71,6 @@ build_linux_310:
   cache:
     key: 'build-py310'
 
-build_macos_intel_39:
-  extends: .build_macos_template
-  variables:
-    PYTHON_VERSION: "3.9"
-  tags:
-    - bob
-    - macos
-    - intel
-  cache:
-    key: 'build-py39'
-
-build_macos_intel_310:
-  extends: .build_macos_template
-  variables:
-    PYTHON_VERSION: "3.10"
-  tags:
-    - bob
-    - macos
-    - intel
-  cache:
-    key: 'build-py310'
 
 build_macos_arm_39:
   extends: .build_macos_template

bob/devtools/data/gitlab-ci/noarch.yaml

@@ -74,21 +74,6 @@ build_linux:
       - ${CONDA_ROOT}/conda-bld/noarch/*.tar.bz2
 
 
-build_macos_intel:
-  variables:
-    PYTHON_VERSION: "3.10"
-  cache:
-    key: "build"
-  extends: .build_template
-  tags:
-    - bob
-    - macos
-    - intel
-  before_script:
-    - !reference [.bootstrap, before_script]
-    - bdt ci check -vv
-
-
 build_macos_arm:
   variables:
     PYTHON_VERSION: "3.10"
@@ -127,14 +112,6 @@ build_macos_arm:
     CONDA_OVERRIDE_CUDA: "11.6"
 
 
-.test_macos_intel_template:
-  extends: .test_template
-  tags:
-    - bob
-    - macos
-    - intel
-
-
 .test_macos_arm_template:
   extends: .test_template
   tags:
@@ -153,7 +130,6 @@ build_macos_arm:
     - bdt ci clean -vv
   dependencies:
     - build_linux
-    - build_macos_intel
     - build_macos_arm
   tags:
     - bob
@@ -195,7 +171,6 @@ pypi:
     - bdt ci clean -vv
   dependencies:
     - build_linux
-    - build_macos_intel
     - build_macos_arm
   tags:
     - bob

bob/devtools/data/gitlab-ci/single-package.yaml

@@ -71,21 +71,6 @@ stages:
     CONDA_OVERRIDE_CUDA: "11.6"
 
 
-.build_macos_intel_template:
-  extends: .build_template
-  tags:
-    - bob
-    - macos
-    - intel
-  before_script:
-    - !reference [.bootstrap, before_script]
-    - bdt ci check -vv
-  artifacts:
-    paths:
-      - ${CONDA_ROOT}/conda-bld/osx-64/*.conda
-      - ${CONDA_ROOT}/conda-bld/osx-64/*.tar.bz2
-
-
 .build_macos_arm_template:
   extends: .build_template
   tags:
@@ -101,20 +86,6 @@ stages:
       - ${CONDA_ROOT}/conda-bld/osx-arm64/*.tar.bz2
 
 
-build_macos_intel_39:
-  extends: .build_macos_intel_template
-  variables:
-    PYTHON_VERSION: "3.9"
-  cache:
-    key: "build-py39"
-
-build_macos_intel_310:
-  extends: .build_macos_intel_template
-  variables:
-    PYTHON_VERSION: "3.10"
-  cache:
-    key: "build-py310"
-
 build_macos_arm_39:
   extends: .build_macos_arm_template
   variables:
@@ -166,8 +137,6 @@ build_linux_310:
   dependencies:
     - build_linux_39
     - build_linux_310
-    - build_macos_intel_39
-    - build_macos_intel_310
     - build_macos_arm_39
     - build_macos_arm_310
   tags:
@@ -212,8 +181,6 @@ pypi:
   dependencies:
     - build_linux_39
     - build_linux_310
-    - build_macos_intel_39
-    - build_macos_intel_310
     - build_macos_arm_39
     - build_macos_arm_310
   tags:

conda/meta.yaml

@@ -45,7 +45,7 @@ requirements:
     - gitpython
     - python-gitlab
     - requests
-    - sphinx >=4.0.2
+    - sphinx ==5.3.0
     - pyyaml >=5.1
     - twine
     - lxml