Merge branch 'backport_updates' into 1.5.x

.github/workflows/PR_license.yml

@@ -21,7 +21,7 @@ jobs:
     if: contains(github.event.pull_request.labels.*.name, 'safe to test')
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
     steps:
     - uses: actions/checkout@v4
       with:

.github/workflows/PR_nolicense.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}

.github/workflows/publish_pypi.yml

@@ -31,13 +31,13 @@ jobs:
           gurobi-machinelearning \
           https://pypi.anaconda.org/gurobi-machinelearning-wheels-staging/simple/gurobi-machinelearning/
     - name: Publish package to TestPyPI
-      uses: pypa/[email protected].11
+      uses: pypa/[email protected].14
       with:
         password: ${{ secrets.TEST_PYPI_TOKEN }}
         repository_url: https://test.pypi.org/legacy/
       if: ${{ github.event.inputs.pypi_repo == 'testpypi' }}
     - name: Publish package to PyPI
-      uses: pypa/[email protected].11
+      uses: pypa/[email protected].14
       with:
         password: ${{ secrets.PYPI_TOKEN }}
       if: ${{ github.event.inputs.pypi_repo == 'pypi' }}

.github/workflows/push.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}

.pre-commit-config.yaml

@@ -46,3 +46,9 @@ repos:
           entry: python3 .github/hooks/license_embedded.py
           language: system
           files: (src/.*\.py|.*\.ipynb)
+
+    - repo: https://github.com/jorisroovers/gitlint
+      rev: v0.19.1 # Fill in a tag / sha here (e.g. v0.19.1)
+      hooks:
+      - id: gitlint
+        args: [--ignore=B6, --msg-filename]

README.md

@@ -1,6 +1,6 @@
 [![build and test](https://github.com/Gurobi/gurobi-machinelearning/actions/workflows/push.yml/badge.svg?branch=main)](https://github.com/Gurobi/gurobi-machinelearning/actions/workflows/push.yml?query=branch%3Amain++)
 [![build wheel](https://github.com/Gurobi/gurobi-machinelearning/actions/workflows/build_wheel.yml/badge.svg?branch=main)](https://github.com/Gurobi/gurobi-machinelearning/actions/workflows/build_wheel.yml?query=branch%3Amain++)
-![Python versions](https://img.shields.io/badge/python-3.9%20|%203.10%20|%203.11-blue)
+![Python versions](https://img.shields.io/badge/python-3.9%20|%203.10%20|%203.11%203.12-blue)
 [![Black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![PyPI](https://img.shields.io/pypi/v/gurobi-machinelearning)](https://pypi.org/project/gurobi-machinelearning)
 [![ReadTheDocs](https://readthedocs.com/projects/gurobi-optimization-gurobi-machine-learning/badge/?version=stable)](https://gurobi-optimization-gurobi-machine-learning.readthedocs-hosted.com)

docs/requirements.txt

@@ -1,13 +1,13 @@
 gurobipy==11.0.1
 gurobipy-pandas==1.1.1
-ipykernel==6.29.3
+ipykernel==6.29.4
 jupytext==1.16.1
 matplotlib==3.6.0
-matplotlib-inline==0.1.6
+matplotlib-inline==0.1.7
 sphinxcontrib_bibtex==2.6.2
 numpy==1.26.4
-numpydoc==1.6.0
-pandas==2.2.1
+numpydoc==1.7.0
+pandas==2.2.2
 scikit-learn==1.4.1.post1
 seaborn==0.13.2
 Sphinx==7.2.6

notebooks/adversarial/adversarial_keras.ipynb

@@ -88,7 +88,7 @@
    "source": [
     "nn = tf.keras.models.Sequential(\n",
     "    [\n",
-    "        tf.keras.layers.InputLayer(28 * 28),\n",
+    "        tf.keras.layers.InputLayer((28 * 28,)),\n",
     "        tf.keras.layers.Dense(50, activation=\"relu\"),\n",
     "        tf.keras.layers.Dense(50, activation=\"relu\"),\n",
     "        tf.keras.layers.Dense(10),\n",
@@ -243,9 +243,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3.10",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
-   "name": "python310"
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
@@ -257,7 +257,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.0"
+   "version": "3.11.8"
   },
   "license": {
    "full_text": "# Copyright © 2023 Gurobi Optimization, LLC\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#     http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# =============================================================================="

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "gurobi-machinelearning"
-version = "1.5.0"
+version = "1.5.0post1"
 description = "package to insert ML models in Gurobi"
 readme = "README.md"
 requires-python = ">=3.9"

requirements.keras.txt

@@ -1 +1 @@
-tensorflow==2.15.0.post1
+tensorflow==2.16.1

requirements.pandas.txt

@@ -1,2 +1,2 @@
-pandas==2.2.1
+pandas==2.2.2
 gurobipy-pandas==1.1.1

requirements.pytorch.txt

@@ -1 +1 @@
-torch==2.2.1
+torch==2.2.2

requirements.tox.txt

@@ -1,2 +1,2 @@
 numpy==1.26.4
-scipy==1.12.0
+scipy==1.13.0

requirements.txt

@@ -1,6 +1,6 @@
 gurobipy==11.0.1
 numpy==1.26.4
-pandas==2.2.1
+pandas==2.2.2
 scikit-learn==1.4.1.post1
 seaborn==0.13.2
 .