Merge pull request #3974 from mrmundt/reset-development

Resetting main for development (6.10.2.dev0)

Author: blnicho

.github/workflows/release_wheel_creation.yml

@@ -79,7 +79,7 @@ jobs:
             CIBW_SKIP: "*-musllinux*"
             CIBW_BUILD_VERBOSITY: 1
             CIBW_ENVIRONMENT: PYOMO_SETUP_ARGS="${{ matrix.GLOBAL_OPTIONS }}"
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: native_wheels-${{ matrix.os }}-${{ matrix.TARGET }}
           path: dist/*.whl
@@ -132,7 +132,7 @@ jobs:
             CIBW_SKIP: "*-musllinux*"
             CIBW_BUILD_VERBOSITY: 1
             CIBW_ENVIRONMENT: PYOMO_SETUP_ARGS="${{ matrix.GLOBAL_OPTIONS }}"
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: alt_wheels-${{ matrix.os }}-${{ matrix.TARGET }}
           path: dist/*.whl
@@ -152,7 +152,7 @@ jobs:
           sed '1,/REMOVE-EVERYTHING-BEFORE-THIS-LINE/d' README.md > README.new
           mv README.new README.md
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -164,7 +164,7 @@ jobs:
           export PYOMO_SETUP_ARGS=--without-cython
           python -m build --wheel --outdir dist --config-setting="--build-option=--without-cython"
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: purepythonwheel
           path: dist/*.whl
@@ -189,7 +189,7 @@ jobs:
         sed '1,/REMOVE-EVERYTHING-BEFORE-THIS-LINE/d' README.md > README.new
         mv README.new README.md
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -201,7 +201,7 @@ jobs:
         export PYOMO_SETUP_ARGS=--without-cython
         python -m build --sdist --outdir dist --config-setting="--build-option=--without-cython"
     - name: Upload artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: generictarball
         path: dist

pyomo/version/info.py

@@ -19,8 +19,8 @@
 #
 major = 6
 minor = 10
-micro = 1
-releaselevel = 'final'
+micro = 2
+# releaselevel = 'final'
 serial = 0