Update minimum Conan version to 1.31.2. (#1097)

This new version correctly handles urllib3 compatibility,
so there is no need to pre-install urllib3 anymore. It also adds
native AppleClang12 compatibility, so there's no need to
provide our own conan settings file.

Co-authored-by: Matthew Treinish <mtreinish@kortar.org>

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
         with:
           python-version: 3.7
       - name: Install deps
-        run: pip install "urllib3<1.26" conan
+        run: pip install "conan>=1.31.2"
       - name: Install openblas
         run: |
           set -e

cmake/conan_utils.cmake

@@ -43,9 +43,6 @@ macro(setup_conan)
         list(APPEND AER_CONAN_LIBS catch2)
     endif()
 
-    # Add Appleclang-12 until officially supported by Conan
-    conan_config_install(ITEM ${PROJECT_SOURCE_DIR}/conan_settings)
-
     conan_cmake_run(REQUIRES ${REQUIREMENTS}
                     OPTIONS ${CONAN_OPTIONS}
                     ENV CONAN_CMAKE_PROGRAM=${CMAKE_COMMAND}

conan_settings/settings.yml

@@ -1,98 +0,0 @@
-
-# Only for cross building, 'os_build/arch_build' is the system that runs Conan
-os_build: [Windows, WindowsStore, Linux, Macos, FreeBSD, SunOS, AIX]
-arch_build: [x86, x86_64, ppc32be, ppc32, ppc64le, ppc64, armv5el, armv5hf, armv6, armv7, armv7hf, armv7s, armv7k, armv8, armv8_32, armv8.3, sparc, sparcv9, mips, mips64, avr, s390, s390x, sh4le]
-
-# Only for building cross compilation tools, 'os_target/arch_target' is the system for
-# which the tools generate code
-os_target: [Windows, Linux, Macos, Android, iOS, watchOS, tvOS, FreeBSD, SunOS, AIX, Arduino, Neutrino]
-arch_target: [x86, x86_64, ppc32be, ppc32, ppc64le, ppc64, armv5el, armv5hf, armv6, armv7, armv7hf, armv7s, armv7k, armv8, armv8_32, armv8.3, sparc, sparcv9, mips, mips64, avr, s390, s390x, asm.js, wasm, sh4le]
-
-# Rest of the settings are "host" settings:
-# - For native building/cross building: Where the library/program will run.
-# - For building cross compilation tools: Where the cross compiler will run.
-os:
-    Windows:
-        subsystem: [None, cygwin, msys, msys2, wsl]
-    WindowsStore:
-        version: ["8.1", "10.0"]
-    WindowsCE:
-        platform: ANY
-        version: ["5.0", "6.0", "7.0", "8.0"]
-    Linux:
-    Macos:
-        version: [None, "10.6", "10.7", "10.8", "10.9", "10.10", "10.11", "10.12", "10.13", "10.14", "10.15"]
-    Android:
-        api_level: ANY
-    iOS:
-        version: ["7.0", "7.1", "8.0", "8.1", "8.2", "8.3", "9.0", "9.1", "9.2", "9.3", "10.0", "10.1", "10.2", "10.3", "11.0", "11.1", "11.2", "11.3", "11.4", "12.0", "12.1", "12.2", "12.3", "12.4", "13.0", "13.1", "13.2", "13.3", "13.4", "13.5", "13.6"]
-    watchOS:
-        version: ["4.0", "4.1", "4.2", "4.3", "5.0", "5.1", "5.2", "5.3", "6.0", "6.1"]
-    tvOS:
-        version: ["11.0", "11.1", "11.2", "11.3", "11.4", "12.0", "12.1", "12.2", "12.3", "12.4", "13.0"]
-    FreeBSD:
-    SunOS:
-    AIX:
-    Arduino:
-        board: ANY
-    Emscripten:
-    Neutrino:
-        version: ["6.4", "6.5", "6.6", "7.0", "7.1"]
-arch: [x86, x86_64, ppc32be, ppc32, ppc64le, ppc64, armv4, armv4i, armv5el, armv5hf, armv6, armv7, armv7hf, armv7s, armv7k, armv8, armv8_32, armv8.3, sparc, sparcv9, mips, mips64, avr, s390, s390x, asm.js, wasm, sh4le]
-compiler:
-    sun-cc:
-        version: ["5.10", "5.11", "5.12", "5.13", "5.14", "5.15"]
-        threads: [None, posix]
-        libcxx: [libCstd, libstdcxx, libstlport, libstdc++]
-    gcc: &gcc
-        version: ["4.1", "4.4", "4.5", "4.6", "4.7", "4.8", "4.9",
-                  "5", "5.1", "5.2", "5.3", "5.4", "5.5",
-                  "6", "6.1", "6.2", "6.3", "6.4", "6.5",
-                  "7", "7.1", "7.2", "7.3", "7.4", "7.5",
-                  "8", "8.1", "8.2", "8.3", "8.4",
-                  "9", "9.1", "9.2", "9.3",
-                  "10", "10.1"]
-        libcxx: [libstdc++, libstdc++11]
-        threads: [None, posix, win32] #  Windows MinGW
-        exception: [None, dwarf2, sjlj, seh] # Windows MinGW
-        cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20]
-    Visual Studio: &visual_studio
-        runtime: [MD, MT, MTd, MDd]
-        version: ["8", "9", "10", "11", "12", "14", "15", "16"]
-        toolset: [None, v90, v100, v110, v110_xp, v120, v120_xp,
-                  v140, v140_xp, v140_clang_c2, LLVM-vs2012, LLVM-vs2012_xp,
-                  LLVM-vs2013, LLVM-vs2013_xp, LLVM-vs2014, LLVM-vs2014_xp,
-                  LLVM-vs2017, LLVM-vs2017_xp, v141, v141_xp, v141_clang_c2, v142,
-                  llvm, ClangCL]
-        cppstd: [None, 14, 17, 20]
-    clang:
-        version: ["3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "4.0",
-                  "5.0", "6.0", "7.0", "7.1",
-                  "8", "9", "10"]
-        libcxx: [None, libstdc++, libstdc++11, libc++, c++_shared, c++_static]
-        cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20]
-        runtime: [None, MD, MT, MTd, MDd]
-    apple-clang: &apple_clang
-        version: ["5.0", "5.1", "6.0", "6.1", "7.0", "7.3", "8.0", "8.1", "9.0", "9.1", "10.0", "11.0", "12.0"]
-        libcxx: [libstdc++, libc++]
-        cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20]
-    intel:
-        version: ["11", "12", "13", "14", "15", "16", "17", "18", "19", "19.1"]
-        base:
-            gcc:
-                <<: *gcc
-                threads: [None]
-                exception: [None]
-            Visual Studio:
-                <<: *visual_studio
-            apple-clang:
-                <<: *apple_clang
-    qcc:
-        version: ["4.4", "5.4", "8.3"]
-        libcxx: [cxx, gpp, cpp, cpp-ne, accp, acpp-ne, ecpp, ecpp-ne]
-        cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17]
-
-build_type: [None, Debug, Release, RelWithDebInfo, MinSizeRel]
-
-
-cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20]  # Deprecated, use compiler.cppstd

pyproject.toml

@@ -1,3 +1,3 @@
 [build-system]
-requires = ["setuptools", "wheel", "urllib3<1.26", "conan>=1.22.2", "scikit-build", 
+requires = ["setuptools", "wheel", "conan>=1.31.2", "scikit-build",
   "cmake!=3.17.1,!=3.17.0", "ninja", "pybind11>2.6", "numpy>1.16.3"]

releasenotes/notes/update-conan-0e891458bcc96ee2.yaml

@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    The minimum version of `Conan <https://conan.io/>`__ has been increased to 1.31.2. This was necessary
+    to fix a compatibility issue with newer versions of the `urllib3 <https://pypi.org/project/urllib3/>`__ (which
+    is a dependency of Conan). It also adds native support for AppleClang 12 which is useful for users with
+    new Apple computers.

requirements-dev.txt

@@ -1,6 +1,6 @@
 stestr>=2.5.0
 cmake!=3.17.1,!=3.17.0
-conan>=1.22.2
+conan>=1.31.2
 scikit-build
 asv
 cvxpy>=1.0.0;python_version>'3.6' and python_version<='3.8'
@@ -14,5 +14,3 @@ jupyter-sphinx;python_version<'3.8'
 reno>=3.1.0
 ddt>=1.2.0,!=1.4.0
 
-# Problem with Conan and urllib3==1.26
-urllib3<1.26

setup.py

@@ -19,10 +19,7 @@ if not _DISABLE_CONAN:
     try:
         from conans import client
     except ImportError:
-        # Problem with Conan and urllib3 1.26
+        subprocess.call([sys.executable, '-m', 'pip', 'install', 'conan>=1.31.2'])
-        subprocess.call([sys.executable, '-m', 'pip', 'install', 'urllib3<1.26'])
-
-        subprocess.call([sys.executable, '-m', 'pip', 'install', 'conan'])
         from conans import client
 
 try:
@@ -60,7 +57,6 @@ setup_requirements = common_requirements + [
     'cmake!=3.17,!=3.17.0',
 ]
 if not _DISABLE_CONAN:
-    setup_requirements.append('urllib3<1.26')
     setup_requirements.append('conan>=1.22.2')
 
 requirements = common_requirements + ['qiskit-terra>=0.12.0']