Fix merge conflict

Author: nchristensen

.github/workflows/docs.yml

@@ -36,6 +36,7 @@ jobs:
 
     - name: Install dependencies
       run: |
+        pip install build
         pip install ".[dev]"
 
     - name: Make docs

.github/workflows/pytest.yml

@@ -56,7 +56,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
 
     steps:
@@ -159,9 +159,9 @@ jobs:
     - name: Create sdist
       id: sdist
       run: |
-        python -m pip install --upgrade pip
-        python setup.py sdist
-        echo "sdist_name=$(ls -t dist/${{ env.package-name }}-*.tar.gz | head -n 1)" >> $GITHUB_ENV
+        python -m pip install --upgrade pip build
+        python -m build --sdist
+        echo "sdist_name=$(ls -t dist/${{ env.package-name }}-*.tar.gz | head -n 1)" >> "$GITHUB_ENV"
 
     - name: Install ${{ env.package-name }}
       run: |

.github/workflows/release.yml

@@ -43,11 +43,12 @@ on:
       - main
       # Release branches
       - "[0-9]+.[0-9]+.X"
-
-  create:
     tags:
       - v*
 
+  release:
+    types: [created]
+
 env:
   package-name: ConfigSpace
 
@@ -65,7 +66,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        py: [cp37, cp38, cp39, cp310]
+        # We can drop "i686" once "cp37" is dropped
+        py: [cp37, cp38, cp39, cp310, cp311]
         arch: ["x86_64", "i686", "aarch64"]
         system: ["manylinux", "musllinux"]
 
@@ -74,9 +76,19 @@ jobs:
           # Not supported by numpy
           - system: "musllinux"
 
-          # Scipy doesn't have a wheel for cp310 i686
+          # Scipy lacks some i686 support, which cause the testing of the wheels
+          # to fail, as scipy is attempted to be built form scratch
+          - py: cp38
+            arch: i686
+
+          - py: cp39
+            arch: i686
+
           - py: cp310
-            arch: "i686"
+            arch: i686
+
+          - py: cp311
+            arch: i686
 
     steps:
       - name: Checkout ${{ env.package-name }}
@@ -87,7 +99,7 @@ jobs:
         uses: docker/setup-qemu-action@v1
 
       - name: Build wheels with cibuildwheel to wheelhouse/*.whl
-        uses: pypa/cibuildwheel@v2.3.1
+        uses: pypa/cibuildwheel@v2.11.4
         env:
           CIBW_BUILD: ${{ matrix.py }}-${{ matrix.system }}_*
           CIBW_ARCHS: ${{ matrix.arch }}
@@ -105,7 +117,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        py: [cp37, cp38, cp39, cp310]
+        py: [cp37, cp38, cp39, cp310, cp311]
         arch: ["x86_64", "universal2", "arm64"]
         exclude:
 
@@ -121,7 +133,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Build wheels with cibuildwheel to wheelhouse/*.whl
-        uses: pypa/cibuildwheel@v2.3.1
+        uses: pypa/cibuildwheel@v2.11.4
         env:
           CIBW_BUILD: ${{ matrix.py }}-*
           CIBW_ARCHS: ${{ matrix.arch }}
@@ -139,21 +151,30 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        py: [cp37, cp38, cp39, cp310]
+        py: [cp37, cp38, cp39, cp310, cp311]
         arch: ["AMD64", "x86"]
+
         exclude:
+          # Scipy lacks win32 support, which cause the testing of the wheels
+          # to fail, as scipy is attempted to be built form scratch
+          - py: cp38
+            arch: x86
+
+          - py: cp39
+            arch: x86
 
-          # We can't build win32 (x86) with cp310 because numpy doesn't have a win32 wheel
           - py: cp310
-            arch: "x86"
+            arch: x86
 
+          - py: cp311
+            arch: x86
 
     steps:
       - name: Checkout ${{ env.package-name }}
         uses: actions/checkout@v2
 
       - name: Build wheels with cibuildwheel to wheelhouse/*.whl
-        uses: pypa/cibuildwheel@v2.3.1
+        uses: pypa/cibuildwheel@v2.11.4
         env:
           CIBW_BUILD: ${{ matrix.py }}-*
           CIBW_ARCHS: ${{ matrix.arch }}
@@ -171,7 +192,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        py: ["3.7", "3.8", "3.9", "3.10"]
+        py: ["3.7", "3.8", "3.9", "3.10", "3.11"]
 
     steps:
       - name: Checkout ${{ env.package-name }}
@@ -184,9 +205,9 @@ jobs:
 
       - name: Build source distribution
         run: |
-          python -m pip install --upgrade pip
-          python setup.py sdist
-          echo "sdist_name=$(ls -t dist/${{ env.package-name }}-*.tar.gz | head -n 1)" >> $GITHUB_ENV
+          python -m pip install --upgrade pip build
+          python -m build --sdist
+          echo "sdist_name=$(ls -t dist/${{ env.package-name }}-*.tar.gz | head -n 1)" >> "$GITHUB_ENV"
 
       - name: Twine check ${{ env.package-name }}
         run: |
@@ -223,7 +244,7 @@ jobs:
     needs: [build_linux_wheels, build_macos_wheels, build_windows_wheels, build_sdist]
 
     # Only on a tagged release, push
-    if: startsWith(github.ref, 'refs/tags/v')  && github.event_name != 'pull_request'
+    if: startsWith(github.ref, 'refs/tags/v') && github.event_name != 'pull_request'
 
     steps:
       - name: Checkout ${{ env.package-name }}

.pre-commit-config.yaml

@@ -7,8 +7,8 @@ repos:
         name: mypy ConfigSpace
         files: ConfigSpace
 
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 4.0.1
+  - repo: https://github.com/pycqa/flake8
+    rev: 5.0.4
     hooks:
       - id: flake8
         name: flake8 ConfigSpace

ConfigSpace/__init__.py

@@ -29,8 +29,6 @@
 from ConfigSpace.__version__ import __version__
 from ConfigSpace.__authors__ import __authors__
 
-import ConfigSpace.api.distributions as distributions
-import ConfigSpace.api.types as types
 from ConfigSpace.api import (Beta, Categorical, Distribution, Float, Integer,
                              Normal, Uniform)
 from ConfigSpace.conditions import (AndConjunction, EqualsCondition,
@@ -54,6 +52,8 @@
                                          UniformFloatHyperparameter,
                                          UniformIntegerHyperparameter,
                                          UnParametrizedHyperparameter)
+import ConfigSpace.api.distributions as distributions
+import ConfigSpace.api.types as types
 
 __all__ = [
     "__authors__",

ConfigSpace/__version__.py

@@ -1,4 +1,4 @@
 """Version information."""
 
 # The following line *must* be the last in the module, exactly as formatted:
-__version__ = "0.6.0"
+__version__ = "0.6.1"

ConfigSpace/c_util.pyx

@@ -1,5 +1,3 @@
-# cython: language_level=3
-
 from collections import deque
 
 import numpy as np

ConfigSpace/conditions.pxd

@@ -1,5 +1,3 @@
-# cython: language_level=3
-
 import numpy as np
 cimport numpy as np
 

ConfigSpace/conditions.pyx

@@ -26,8 +26,6 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# cython: language_level=3
-
 import io
 from functools import reduce
 from abc import ABCMeta, abstractmethod

ConfigSpace/configuration_space.pyx

@@ -26,8 +26,6 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# cython: language_level=3
-
 import collections.abc
 from collections import defaultdict, deque, OrderedDict
 import copy
@@ -1528,12 +1526,12 @@ class ConfigurationSpace(collections.abc.Mapping):
                 new_child = new_configspace[child_name]
                 new_parent = new_configspace[parent_name]
 
-                if hasattr(condition, 'value'):
-                    condition_arg = getattr(condition, 'value')
-                    substituted_condition = condition_type(child=new_child, parent=new_parent, value=condition_arg)
-                elif hasattr(condition, 'values'):
+                if hasattr(condition, 'values'):
                     condition_arg = getattr(condition, 'values')
                     substituted_condition = condition_type(child=new_child, parent=new_parent, values=condition_arg)
+                elif hasattr(condition, 'value'):
+                    condition_arg = getattr(condition, 'value')
+                    substituted_condition = condition_type(child=new_child, parent=new_parent, value=condition_arg)
                 else:
                     raise AttributeError(f'Did not find the expected attribute in condition {type(condition)}.')
 
@@ -1575,15 +1573,24 @@ class ConfigurationSpace(collections.abc.Mapping):
                 hyperparameter_name = getattr(forbidden.hyperparameter, 'name')
                 new_hyperparameter = new_configspace[hyperparameter_name]
 
-                if hasattr(forbidden, 'value'):
-                    forbidden_arg = getattr(forbidden, 'value')
-                    substituted_forbidden = forbidden_type(hyperparameter=new_hyperparameter, value=forbidden_arg)
-                elif hasattr(forbidden, 'values'):
+                if hasattr(forbidden, 'values'):
                     forbidden_arg = getattr(forbidden, 'values')
                     substituted_forbidden = forbidden_type(hyperparameter=new_hyperparameter, values=forbidden_arg)
+                elif hasattr(forbidden, 'value'):
+                    forbidden_arg = getattr(forbidden, 'value')
+                    substituted_forbidden = forbidden_type(hyperparameter=new_hyperparameter, value=forbidden_arg)
                 else:
                     raise AttributeError(f'Did not find the expected attribute in forbidden {type(forbidden)}.')
 
+                new_forbiddens.append(substituted_forbidden)
+            elif isinstance(forbidden, ForbiddenRelation):
+                forbidden_type = type(forbidden)
+                left_name = getattr(forbidden.left, 'name')
+                left_hyperparameter = new_configspace[left_name]
+                right_name = getattr(forbidden.right, 'name')
+                right_hyperparameter = new_configspace[right_name]
+
+                substituted_forbidden = forbidden_type(left=left_hyperparameter, right=right_hyperparameter)
                 new_forbiddens.append(substituted_forbidden)
             else:
                 raise TypeError(f'Did not expect the supplied forbidden type {type(forbidden)}.')