Merge branch 'trunk' of http://gitbox.apache.org/repos/asf/libcloud i…

…nto trunk
apache · Aug 1, 2023 · 572c3ff · 572c3ff
2 parents 56674f4 + 35b411b
commit 572c3ff
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -106,7 +106,8 @@ jobs:
          tox -e py${{ matrix.python_version }}
 
       - name: Run dist install checks tox target
-        if: ${{ matrix.python_version != 'pypy-3.7' && matrix.python_version != 'pyjion' }}
+        # NOTE: 3.12 will be failing until we migrate away from setup.py
+        if: ${{ matrix.python_version != 'pypy-3.7' && matrix.python_version != 'pyjion' && matrix.python_version != '3.12-dev' }}
         run: |
          tox -e py${{ matrix.python_version }}-dist,py${{ matrix.python_version }}-dist-wheel
 

diff --git a/scripts/dist_install_check.sh b/scripts/dist_install_check.sh
@@ -15,6 +15,7 @@
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
+set -e
 
 # Verify library installs without any dependencies when using python setup.py
 # install
@@ -26,7 +27,7 @@ python --version
 pip show requests && exit 1
 pip show typing && exit 1
 pip show enum34 && exit 1
-pip show apache-libcloud
+pip show apache-libcloud && exit 1
 
 # Install the library
 python setup.py install

diff --git a/scripts/dist_wheel_install_check.sh b/scripts/dist_wheel_install_check.sh
@@ -17,6 +17,7 @@
 #  under the License.
 
 # Verify library installs without any dependencies when using built wheel
+set -e
 
 echo "Running dist wheel install checks"
 python --version
@@ -26,7 +27,7 @@ python --version
 pip show requests && exit 1
 pip show typing && exit 1
 pip show enum34 && exit 1
-pip show apache-libcloud
+pip show apache-libcloud && exit 1
 rm -rf dist/apache_libcloud-*.whl
 
 pip install wheel