Merge branch 'main' into 'python-3.6.13'

Update to Conan 1.59.0 See merge request !4

Merge branch 'main' into 'python-3.6.13'
d7a7a5c7 · MADELA Patrick · 761195b5 · 76649087 · d7a7a5c7 · d7a7a5c7
Commit d7a7a5c7 authored 2 years ago by MADELA Patrick
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
-
 variables:
-  CONAN_VERSION: "1.57.0"
+  CONAN_VERSION: "1.59.0"
  PYTHON_VERSION: "3.6.13"

 workflow:

--- a/README.md
+++ b/README.md
@@ -2,6 +2,6 @@

 Pipeline to create Conan package for Python 3.6.13.

-Conan 1.57.0 for:
-* Linux 32 bits: [conan-1.57.0-linux-python-3.6.13-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/python-3.6.13/download?job=linux-i686)
-* Linux 64 bits: [conan-1.57.0-linux-python-3.6.13-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/python-3.6.13//download?job=linux-x86_64)
+Conan 1.59.0 for:
+* Linux 32 bits: [conan-1.59.0-linux-python-3.6.13-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/python-3.6.13/download?job=linux-i686)
+* Linux 64 bits: [conan-1.59.0-linux-python-3.6.13-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/python-3.6.13//download?job=linux-x86_64)