You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jd...@apache.org on 2023/04/03 19:40:07 UTC

[qpid-dispatch] branch main updated (2370cd01 -> 94f4b567)

This is an automated email from the ASF dual-hosted git repository.

jdanek pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git


    from 2370cd01 DISPATCH-2354: Fix compilation error on Fedora rawhide
     new 9c40a32e DISPATCH-2356: CFFI Proton now installs whl into dist/, previously it was in pkgs/
     new 129af811 DISPATCH-2356: Proton main has minimal requirements of CMake 3.16 and Python 3.8
     new 94f4b567 DISPATCH-2356: Remove integer offered capability values from test_50_extension_capabilities

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/build.yaml     | 39 +++++++++++++++++++++++++++------------
 tests/system_tests_one_router.py |  1 -
 2 files changed, 27 insertions(+), 13 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


[qpid-dispatch] 01/03: DISPATCH-2356: CFFI Proton now installs whl into dist/, previously it was in pkgs/

Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jdanek pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git

commit 9c40a32eef5e2e6388ead55588ff086538d6449b
Author: Jiri Daněk <jd...@redhat.com>
AuthorDate: Tue Jan 31 08:40:31 2023 +0100

    DISPATCH-2356: CFFI Proton now installs whl into dist/, previously it was in pkgs/
---
 .github/workflows/build.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 204efd3d..a5aae9e8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -158,7 +158,7 @@ jobs:
             --exclude='qpid-dispatch/build/console' \
             qpid-dispatch \
             install \
-            qpid-proton/build/python/pkgs
+            qpid-proton/build/python
 
       - name: Upload archive
         uses: actions/upload-artifact@v3
@@ -218,7 +218,7 @@ jobs:
         run: tar -I pixz -xf archive.tar.xz
 
       - name: install qpid-proton python wheel
-        run: python -m pip install ${ProtonBuildDir}/python/pkgs/python_qpid_proton*.whl
+        run: python -m pip install $(find ${ProtonBuildDir}/python/ -name 'python_qpid_proton*.whl')
 
       - name: CTest
         working-directory: ${{env.DispatchBuildDir}}
@@ -432,7 +432,7 @@ jobs:
       - name: Install Linux runtime/test dependencies
         if: ${{ runner.os == 'Linux' }}
         run: |
-          yum install -y curl
+          yum install -y curl findutils
 
       - name: Install Linux runtime/test dependencies (for sanitizers)
         if: ${{ matrix.runtimeCheck != 'OFF' }}
@@ -440,7 +440,7 @@ jobs:
           dnf install -y binutils
 
       - name: install qpid-proton python wheel
-        run: python3 -m pip install ${ProtonBuildDir}/python/pkgs/python_qpid_proton*.whl
+        run: python3 -m pip install $(find ${ProtonBuildDir}/python/ -name 'python_qpid_proton*.whl')
 
       - name: CTest
         working-directory: ${{env.DispatchBuildDir}}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


[qpid-dispatch] 03/03: DISPATCH-2356: Remove integer offered capability values from test_50_extension_capabilities

Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jdanek pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git

commit 94f4b567dbdf04261be35a7ae8174aa0deb06853
Author: Ganesh Murthy <ga...@users.noreply.github.com>
AuthorDate: Thu Mar 9 18:08:50 2023 -0500

    DISPATCH-2356: Remove integer offered capability values from test_50_extension_capabilities
    
    The AMQP standard requires that there be symbol array or a single symbol (#985)
    
    (cherry picked from commit 2a85d02202e6401b9e2df5dbb2e1808386a8cc1a)
---
 tests/system_tests_one_router.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/system_tests_one_router.py b/tests/system_tests_one_router.py
index 25ec109b..287cb9d3 100644
--- a/tests/system_tests_one_router.py
+++ b/tests/system_tests_one_router.py
@@ -734,7 +734,6 @@ class OneRouterTest(TestCase):
         """
         client_caps = [symbol("single"),
                        ["A", "B", "C"],
-                       [9, 10, 11],
                        [],
                        None]
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


[qpid-dispatch] 02/03: DISPATCH-2356: Proton main has minimal requirements of CMake 3.16 and Python 3.8

Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jdanek pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git

commit 129af8111221d92e35d614dba25a9f3e70b0217e
Author: Jiri Daněk <jd...@redhat.com>
AuthorDate: Mon Apr 3 19:16:45 2023 +0200

    DISPATCH-2356: Proton main has minimal requirements of CMake 3.16 and Python 3.8
---
 .github/workflows/build.yaml | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a5aae9e8..529e003e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -100,7 +100,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.6
+          python-version: 3.8
           architecture: x64
 
       - name: Install Python build dependencies
@@ -203,7 +203,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.6
+          python-version: 3.8
           architecture: x64
 
       - name: Install Python runtime/test dependencies
@@ -265,15 +265,15 @@ jobs:
         shards: [ 2 ]
         include:
           - os: ubuntu-20.04
-            container: 'centos'
-            containerTag: 7
+            container: 'rockylinux'
+            containerTag: 8
             runtimeCheck: OFF
             protonGitRef: main
             shard: 1
             shards: 2
           - os: ubuntu-20.04
-            container: 'centos'
-            containerTag: 7
+            container: 'rockylinux'
+            containerTag: 8
             runtimeCheck: OFF
             protonGitRef: main
             shard: 2
@@ -350,14 +350,29 @@ jobs:
           path: 'qpid-dispatch'
 
       - name: Install EPEL (on CentOS 7)
-        if: ${{ matrix.container == 'centos' }}
+        if: ${{ matrix.container == 'centos' && matrix.containerTag == '7' }}
         run: |
           yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
 
+      # https://wiki.rockylinux.org/rocky/repo/#notes-on-epel
+      - name: Install EPEL (on RockyLinux 8)
+        if: ${{ matrix.container == 'rockylinux' && matrix.containerTag == '8' }}
+        run: |
+          dnf install -y epel-release
+          crb enable
+
       - name: Install Linux build dependencies
         if: ${{ runner.os == 'Linux' }}
         run: |
-          yum install -y gcc gcc-c++ cmake libuuid-devel openssl-devel cyrus-sasl-devel cyrus-sasl-plain swig python3-devel python3-pip make libwebsockets-devel ccache libasan libubsan libtsan
+          yum install -y gcc gcc-c++ cmake libuuid-devel openssl-devel cyrus-sasl-devel cyrus-sasl-plain swig make libwebsockets-devel ccache libasan libubsan libtsan
+
+      - name: Install Linux build dependencies (Fedora, CentOS)
+        if: ${{ matrix.container == 'fedora' || matrix.container == 'centos' }}
+        run: yum install -y python3-devel python3-pip
+
+      - name: Install Linux build dependencies (RockyLinux 8)
+        if: ${{ matrix.container == 'rockylinux' && matrix.containerTag == '8' }}
+        run: dnf install -y python39-devel python39-pip
 
       - name: Install Python build dependencies
         run: python3 -m pip install setuptools wheel tox


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org