Merge pull request #407 from AlexanderRichert-NOAA/contourpy_noconflict

Revert "Add conflict with Intel-19 to var/spack/repos/builtin/package…

var/spack/repos/builtin/packages/py-contourpy/package.py

@@ -22,12 +22,5 @@ class PyContourpy(PythonPackage):
     depends_on("py-pybind11@2.6:", type=("build", "link"))
     depends_on("py-setuptools@42:", type="build")
     depends_on("py-numpy@1.16:", type=("build", "run"))
-    depends_on("py-build", when="@:1.0.5", type="build")
 
-    # py-contourpy uses c++-17 flags that cause a problem
-    # with older Intel compilers (@19) in combination with
-    # C++-17 capable backends (gnu@9:). Instead of trying
-    # to figure out what gnu version the Intel compiler
-    # uses as backend, simply refuse to build. See also:
-    # https://bitbucket.org/berkeleylab/upcxx/issues/302/build-failure-for-intel-c-with-std-c-17
-    conflicts("%intel@:19")
+    depends_on("py-build", when="@:1.0.5", type="build")