Merge branch 'master' of https://github.com/vaexio/vaex into build-ma…

…trix * 'master' of https://github.com/vaexio/vaex: 🔖 vaex-meta 4.17.0 released fix: vaex-server pinning 🔖 vaex-ml 0.18.3 released 🔖 vaex-jupyter 0.8.2 released 🔖 vaex-ml 0.18.2 released 🔖 vaex-server 0.9.0 released ci: use ubuntu 20.04 🔖 vaex-core 4.17.1 released fix: invalid check fix: meta version pin on core 🔖 vaex-core 4.17.0 released
ddelange · Aug 3, 2023 · dccdc0c · dccdc0c
2 parents 713febd + 15245cf
commit dccdc0c
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 19 deletions.
diff --git a/.github/workflows/wheel-universal.yml b/.github/workflows/wheel-universal.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-18.04]
+        os: [ubuntu-20.04]
         python-version: [36]
 
     steps:

diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml
@@ -26,7 +26,7 @@ jobs:
         run: |
           MATRIX_INCLUDE=$(
             {
-              cibuildwheel --print-build-identifiers --platform linux --arch x86_64,aarch64 | grep cp |  jq -nRc '{"only": inputs, "os": "ubuntu-latest"}' \
+              cibuildwheel --print-build-identifiers --platform linux --arch x86_64,aarch64 | grep cp |  jq -nRc '{"only": inputs, "os": "ubuntu-20.04"}' \
               && cibuildwheel --print-build-identifiers --platform macos --arch x86_64,arm64 | grep cp |  jq -nRc '{"only": inputs, "os": "macOS-11"}' \
               && cibuildwheel --print-build-identifiers --platform windows --arch AMD64 | grep cp |  jq -nRc '{"only": inputs, "os": "windows-latest"}'
             } | jq -sc

diff --git a/packages/vaex-core/vaex/__init__.py b/packages/vaex-core/vaex/__init__.py
@@ -66,9 +66,7 @@
     if version_info[:2] >= (3, 10):
         from importlib.metadata import entry_points
     else:
-        from importlib_metadata import entry_points, __version__ as importlib_metadata_version
-        if int(importlib_metadata_version.split(".")[0]) < 4.0:
-            raise ImportError("vaex requires importlib_metadata >= 4.0 when installed")
+        from importlib_metadata import entry_points
 except ImportError:
     import pkg_resources
     entry_points = pkg_resources.iter_entry_points

diff --git a/packages/vaex-core/vaex/core/_version.py b/packages/vaex-core/vaex/core/_version.py
@@ -1,2 +1,2 @@
-__version_tuple__ = (4, 17, 0)
-__version__ = '4.17.0'
+__version_tuple__ = (4, 17, 1)
+__version__ = '4.17.1'
diff --git a/packages/vaex-jupyter/vaex/jupyter/_version.py b/packages/vaex-jupyter/vaex/jupyter/_version.py
@@ -1,2 +1,2 @@
-__version_tuple__ = (0, 8, 1)
-__version__ = '0.8.1'
+__version_tuple__ = (0, 8, 2)
+__version__ = '0.8.2'
diff --git a/packages/vaex-meta/setup.py b/packages/vaex-meta/setup.py
@@ -16,13 +16,13 @@
 url = 'https://www.github.com/vaexio/vaex'
 
 install_requires = [
-      'vaex-core>=4.17.0,<4.17',
+      'vaex-core~=4.17.1',
       'vaex-astro>=0.9.3,<0.10',
       'vaex-hdf5>=0.13.0,<0.15',
       'vaex-viz>=0.5.4,<0.6',
-      'vaex-server>=0.8.1,<0.9',
-      'vaex-jupyter>=0.8.1,<0.9',
-      'vaex-ml>=0.18.1,<0.19',
+      'vaex-server~=0.9.0',
+      'vaex-jupyter>=0.8.2,<0.9',
+      'vaex-ml>=0.18.3,<0.19',
       # vaex-graphql is not on conda-forge yet
 ]
 

diff --git a/packages/vaex-meta/vaex/meta/_version.py b/packages/vaex-meta/vaex/meta/_version.py
@@ -1,2 +1,2 @@
-__version_tuple__ = (4, 16, 0)
-__version__ = '4.16.0'
+__version_tuple__ = (4, 17, 0)
+__version__ = '4.17.0'
diff --git a/packages/vaex-ml/vaex/ml/_version.py b/packages/vaex-ml/vaex/ml/_version.py
@@ -1,2 +1,2 @@
-__version__ = '0.18.1'
-__version_tuple__ = (0, 18, 1)
+__version__ = '0.18.3'
+__version_tuple__ = (0, 18, 3)
diff --git a/packages/vaex-server/vaex/server/_version.py b/packages/vaex-server/vaex/server/_version.py
@@ -1,2 +1,2 @@
-__version_tuple__ = (0, 8, 1)
-__version__ = '0.8.1'
+__version_tuple__ = (0, 9, 0)
+__version__ = '0.9.0'