From fd5c324cecd18243f823f9e713943c4788eaf004 Mon Sep 17 00:00:00 2001
From: Ahmed-Bayoumy <ahmed.bayoumy@mail.mcgill.ca>
Date: Sat, 27 Apr 2024 20:33:19 -0400
Subject: [PATCH] Upgrade OMADS

---
 .github/workflows/lx-build-and-tests.yml      |   6 +++---
 .github/workflows/macos-build-and-pytest.yml  |   6 +++---
 .github/workflows/win-build-and-pytest.yml    |   6 +++---
 ...one-any.whl => DMDO-2404-py3-none-any.whl} | Bin 44607 -> 44584 bytes
 setup.cfg                                     |   2 +-
 setup.py                                      |   6 +++---
 6 files changed, 13 insertions(+), 13 deletions(-)
 rename dist/{DMDO-2401-py3-none-any.whl => DMDO-2404-py3-none-any.whl} (93%)

diff --git a/.github/workflows/lx-build-and-tests.yml b/.github/workflows/lx-build-and-tests.yml
index bbacd35..355e4ca 100644
--- a/.github/workflows/lx-build-and-tests.yml
+++ b/.github/workflows/lx-build-and-tests.yml
@@ -20,17 +20,17 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python 3.10
+    - name: Set up Python 3.11
       uses: actions/setup-python@v3
       with:
-        python-version: "3.10"
+        python-version: "3.11"
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install flake8 pytest pytest-cov
         pip install wheel
         python setup.py sdist bdist_wheel
-        pip install dist/DMDO-2401-py3-none-any.whl
+        pip install dist/DMDO-2404-py3-none-any.whl
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names
diff --git a/.github/workflows/macos-build-and-pytest.yml b/.github/workflows/macos-build-and-pytest.yml
index d4f5696..bcf234d 100644
--- a/.github/workflows/macos-build-and-pytest.yml
+++ b/.github/workflows/macos-build-and-pytest.yml
@@ -19,17 +19,17 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python 3.10
+    - name: Set up Python 3.11
       uses: actions/setup-python@v3
       with:
-        python-version: "3.10"
+        python-version: "3.11"
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install flake8 pytest pytest-cov
         pip install wheel
         python setup.py sdist bdist_wheel
-        pip install dist/DMDO-2401-py3-none-any.whl
+        pip install dist/DMDO-2404-py3-none-any.whl
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names
diff --git a/.github/workflows/win-build-and-pytest.yml b/.github/workflows/win-build-and-pytest.yml
index 84c0456..85dd616 100644
--- a/.github/workflows/win-build-and-pytest.yml
+++ b/.github/workflows/win-build-and-pytest.yml
@@ -19,17 +19,17 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python 3.10
+    - name: Set up Python 3.11
       uses: actions/setup-python@v3
       with:
-        python-version: "3.10"
+        python-version: "3.11"
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install flake8 pytest pytest-cov
         pip install wheel
         python setup.py sdist bdist_wheel
-        pip install dist/DMDO-2401-py3-none-any.whl
+        pip install dist/DMDO-2404-py3-none-any.whl
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names
diff --git a/dist/DMDO-2401-py3-none-any.whl b/dist/DMDO-2404-py3-none-any.whl
similarity index 93%
rename from dist/DMDO-2401-py3-none-any.whl
rename to dist/DMDO-2404-py3-none-any.whl
index 8669fa43b4be789ea065c72befeb8b0ab7742f30..ec49363da1d1880a773c5b4200c900196dad975d 100644
GIT binary patch
delta 2471
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

delta 2523
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
K(fQ}UcK-t<V47qA

diff --git a/setup.cfg b/setup.cfg
index cb1eb24..1443c3a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = DMDO
-version = 2401
+version = 2404
 author = Ahmed H. Bayoumy
 author_email = ahmed.bayoumy@mail.mcgill.ca
 description = "Python package for DMDO; an implementation of the Nonhierarchical Analytical Target Cascading (NHATC.)"
diff --git a/setup.py b/setup.py
index f8cccc1..7373eb5 100644
--- a/setup.py
+++ b/setup.py
@@ -5,14 +5,14 @@
     name="DMDO",
     author="Ahmed H. Bayoumy",
     author_email="ahmed.bayoumy@mail.mcgill.ca",
-    version='2401',
+    version='2404',
     packages=find_packages(include=['DMDO', 'DMDO.*']),
     description="Distributed Multidisciplinary Design Optimization (DMDO)",
     install_requires=[
       'pandas>=1.5.2',
-      'NOBM>=1.0.1',
+      'NOBM==2404.1',
       'numpy==1.22.4',
-      'OMADS==2401',
+      'OMADS==2404.1',
       'pyyaml'
     ],
     extras_require={