Merge pull request #81 from IBMDecisionOptimization/vberaudi-2.24

New 2.24 version

Author: vberaudi

README.md

@@ -1,62 +1,61 @@
-# IBM® Decision Optimization Modeling for Python (DOcplex)
-
-Welcome to the IBM® Decision Optimization Modeling for Python.
-Licensed under the Apache License v2.0.
-
-With this library, you can quickly and easily add the power of optimization to
-your application. You need IBM ILOG CPLEX Optimization Studio to solve the models.
-
-This library is composed of 2 modules:
-
-* IBM® Decision Optimization CPLEX Optimizer Modeling for Python - with namespace docplex.mp
-* IBM® Decision Optimization CP Optimizer Modeling for Python - with namespace docplex.cp
-
-Solving with CPLEX locally requires that IBM® ILOG CPLEX Optimization Studio V12.8 or later
-is installed on your machine.
-
-This library is numpy friendly.
-
-## Install the library
-
-```
-   pip install docplex
-```
-
-## Get the documentation and examples
-
-* [Latest documentation](http://ibmdecisionoptimization.github.io/docplex-doc/)
-* Documentation archives:
-   * [2.23.217](http://ibmdecisionoptimization.github.io/docplex-doc/2.23.217)
-   * [2.22.213](http://ibmdecisionoptimization.github.io/docplex-doc/2.22.213)
-   * [2.21.207](http://ibmdecisionoptimization.github.io/docplex-doc/2.21.207)
-   * [2.20.204](http://ibmdecisionoptimization.github.io/docplex-doc/2.20.204)
-   * [2.19.202](http://ibmdecisionoptimization.github.io/docplex-doc/2.19.202)
-   * [2.18.200](http://ibmdecisionoptimization.github.io/docplex-doc/2.18.200)
-   * [2.16.195](http://ibmdecisionoptimization.github.io/docplex-doc/2.16.195)
-* [Examples](https://github.com/IBMDecisionOptimization/docplex-examples)
-
-## Get your IBM® ILOG CPLEX Optimization Studio edition
-
-- You can get a free [Community Edition](https://www.ibm.com/account/reg/us-en/signup?formid=urx-20028)
- of CPLEX Optimization Studio, with limited solving capabilities in term of problem size.
-
-- Faculty members, research professionals at accredited institutions can get access to an unlimited version of CPLEX through the
- [IBM® Academic Initiative](http://ibm.biz/cplex-free-for-students).
-
-## Dependencies
-
-These third-party dependencies are automatically installed with ``pip``
-
-- [enum34](https://pypi.python.org/pypi/enum34)
-- [futures](https://pypi.python.org/pypi/futures)
-- [requests](https://pypi.python.org/pypi/requests)
-- [six](https://pypi.python.org/pypi/six)
-- [certifi](https://pypi.python.org/pypi/certifi)
-- [chardet](https://pypi.python.org/pypi/chardet)
-- [idna](https://pypi.python.org/pypi/idna)
-- [urllib3](https://pypi.python.org/pypi/urllib3)
-
-
-## License
-
-This library is delivered under the  Apache License Version 2.0, January 2004 (see LICENSE.txt).
+# IBM® Decision Optimization Modeling for Python (DOcplex)
+
+Welcome to the IBM® Decision Optimization Modeling for Python.
+Licensed under the Apache License v2.0.
+
+With this library, you can quickly and easily add the power of optimization to
+your application. You need IBM ILOG CPLEX Optimization Studio to solve the models.
+
+This library is composed of 2 modules:
+
+* IBM® Decision Optimization CPLEX Optimizer Modeling for Python - with namespace docplex.mp
+* IBM® Decision Optimization CP Optimizer Modeling for Python - with namespace docplex.cp
+
+Solving with CPLEX requires that IBM® ILOG CPLEX Optimization Studio V12.10 or later
+is installed on your machine.
+
+This library is numpy friendly.
+
+## Install the library
+
+```
+   pip install docplex
+```
+
+## Get the documentation and examples
+
+* [Latest documentation](http://ibmdecisionoptimization.github.io/docplex-doc/)
+* Documentation archives:
+   * [2.23.222](http://ibmdecisionoptimization.github.io/docplex-doc/2.23.222)
+   * [2.22.213](http://ibmdecisionoptimization.github.io/docplex-doc/2.22.213)
+   * [2.21.207](http://ibmdecisionoptimization.github.io/docplex-doc/2.21.207)
+   * [2.20.204](http://ibmdecisionoptimization.github.io/docplex-doc/2.20.204)
+   * [2.19.202](http://ibmdecisionoptimization.github.io/docplex-doc/2.19.202)
+   * [2.18.200](http://ibmdecisionoptimization.github.io/docplex-doc/2.18.200)
+   * [2.16.195](http://ibmdecisionoptimization.github.io/docplex-doc/2.16.195)
+* [Examples](https://github.com/IBMDecisionOptimization/docplex-examples)
+
+## Get your IBM® ILOG CPLEX Optimization Studio edition
+
+- You can get a free [Community Edition](https://www.ibm.com/account/reg/us-en/signup?formid=urx-20028)
+ of CPLEX Optimization Studio, with limited solving capabilities in term of problem size.
+
+- Faculty members, research professionals at accredited institutions can get access to an unlimited version of CPLEX through the
+ [IBM® Academic Initiative](http://ibm.biz/cplex-free-for-students).
+
+## Dependencies
+
+These third-party dependencies are automatically installed with ``pip``
+
+- [futures](https://pypi.python.org/pypi/futures)
+- [requests](https://pypi.python.org/pypi/requests)
+- [six](https://pypi.python.org/pypi/six)
+- [certifi](https://pypi.python.org/pypi/certifi)
+- [chardet](https://pypi.python.org/pypi/chardet)
+- [idna](https://pypi.python.org/pypi/idna)
+- [urllib3](https://pypi.python.org/pypi/urllib3)
+
+
+## License
+
+This library is delivered under the  Apache License Version 2.0, January 2004 (see LICENSE.txt).

examples/cp/basic/color.py

@@ -1,7 +1,7 @@
 # --------------------------------------------------------------------------
 # Source file provided under Apache License, Version 2.0, January 2004,
 # http://www.apache.org/licenses/
-# (c) Copyright IBM Corp. 2015, 2016
+# (c) Copyright IBM Corp. 2015, 2022
 # --------------------------------------------------------------------------
 
 """