Merge pull request #96 from VROOM-Project/nn-manylinux-2_28

switch to manylinux_2_28
VROOM-Project · Aug 22, 2023 · d313bbe · d313bbe
2 parents c140205 + 56856ec
commit d313bbe
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 19 deletions.
diff --git a/.github/workflows/main_push.yml b/.github/workflows/main_push.yml
@@ -21,13 +21,13 @@ jobs:
             platform: windows
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: recursive
 
     - name: Cache Conan
       id: cache-conan
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       if: matrix.platform == 'windows'
       with:
         path: |
@@ -45,14 +45,14 @@ jobs:
       if: matrix.platform == 'windows' && steps.cache-conan.outputs.cache-hit != 'true'
       run: |
         pip install pip --upgrade
-        pip install conan==1.59.0
+        pip install conan<2.0.0
         conan profile new default --detect
         conan profile update "settings.compiler=Visual Studio" default
         conan profile update "settings.compiler.version=17" default
         conan config set "storage.path=$env:GITHUB_WORKSPACE/conan_data"
         conan install --build=openssl --install-folder conan_build .
 
-    - uses: pypa/cibuildwheel@v2.3.1
+    - uses: pypa/cibuildwheel@v2.15.0
       env:
         MACOSX_DEPLOYMENT_TARGET: 10.14
         CIBW_BUILD: '*cp37*'

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -14,11 +14,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: recursive
 
-    - uses: "actions/setup-python@v2"
+    - uses: actions/setup-python@v4
       with:
         python-version: "3.7"
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -39,13 +39,13 @@ jobs:
             platform: windows
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: recursive
 
     - name: Cache Conan
       id: cache-conan
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       if: matrix.platform == 'windows'
       with:
         path: |
@@ -54,7 +54,7 @@ jobs:
         key: conan-${{ matrix.image }}-${{ hashFiles('conanfile.txt') }}
 
     - name: Configure Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       if: matrix.platform == 'windows' && steps.cache-conan.outputs.cache-hit != 'true'
       with:
         python-version: '3.x'
@@ -63,14 +63,14 @@ jobs:
       if: matrix.image == 'windows-latest' && steps.cache-conan.outputs.cache-hit != 'true'
       run: |
         pip install pip --upgrade
-        pip install conan==1.59.0
+        pip install conan<2.0.0
         conan profile new default --detect
         conan profile update "settings.compiler=Visual Studio" default
         conan profile update "settings.compiler.version=17" default
         conan config set "storage.path=$env:GITHUB_WORKSPACE/conan_data"
         conan install --build=openssl --install-folder conan_build .
 
-    - uses: pypa/cibuildwheel@v2.12.0
+    - uses: pypa/cibuildwheel@v2.15.0
       env:
         MACOSX_DEPLOYMENT_TARGET: 10.14
 
@@ -79,7 +79,7 @@ jobs:
       shell: bash
 
     - name: Upload wheels
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         path: wheelhouse/*.whl
 
@@ -91,12 +91,12 @@ jobs:
     steps:
     - uses: actions/setup-python@v2
 
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v3
       with:
         name: artifact
         path: dist
 
-    - uses: pypa/gh-action-pypi-publish@v1.4.2
+    - uses: pypa/gh-action-pypi-publish@v1.8.10
       with:
         user: jonathf
         password: ${{ secrets.pypi_password }}
diff --git a/README.rst b/README.rst
@@ -75,7 +75,7 @@ Basic usage
   7          48    end     2204               2  <NA>
 
 Usage with a routing engine
--------------------
+---------------------------
 
 .. code:: python
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -24,14 +24,15 @@ exclude = '''
 [tool.cibuildwheel]
 test-command = 'python -c "import vroom"'
 build = "cp*"
-skip = "*musllinux*"
+skip = "*musllinux* cp312*"
 archs = "native"
+manylinux-x86_64-image = "quay.io/pypa/manylinux_2_28_x86_64"
 
 [tool.cibuildwheel.linux]
 before-all = """
-yum update -y
-yum install -y epel-release
-yum install -y openssl-devel asio-devel
+dnf update -y
+dnf module enable -y mariadb-devel
+dnf install -y openssl-devel asio-devel
 """
 
 [[tool.cibuildwheel.overrides]]