Browse Source

Merge pull request #9043 from ThomasWaldmann/py314

Python 3.14 release support, use latest msgpack and cython
TW 1 week ago
parent
commit
46d139da81
5 changed files with 9 additions and 9 deletions
  1. 1 1
      .github/workflows/ci.yml
  2. 5 5
      Vagrantfile
  3. 1 1
      pyproject.toml
  4. 1 1
      requirements.d/development.lock.txt
  5. 1 1
      src/borg/helpers/msgpack.py

+ 1 - 1
.github/workflows/ci.yml

@@ -85,7 +85,7 @@ jobs:
               python-version: '3.13'
               toxenv: py313-fuse3
             - os: ubuntu-24.04
-              python-version: '3.14-dev'
+              python-version: '3.14'
               toxenv: py314-fuse3
 
     env:

+ 5 - 5
Vagrantfile

@@ -213,7 +213,7 @@ def install_pythons(boxname)
   return <<-EOF
     . ~/.bash_profile
     echo "PYTHON_CONFIGURE_OPTS: ${PYTHON_CONFIGURE_OPTS}"
-    pyenv install 3.13.5
+    pyenv install 3.13.8
     pyenv rehash
   EOF
 end
@@ -231,8 +231,8 @@ def build_pyenv_venv(boxname)
     . ~/.bash_profile
     cd /vagrant/borg
     # use the latest 3.13 release
-    pyenv global 3.13.5
-    pyenv virtualenv 3.13.5 borg-env
+    pyenv global 3.13.8
+    pyenv virtualenv 3.13.8 borg-env
     ln -s ~/.pyenv/versions/borg-env .
   EOF
 end
@@ -281,8 +281,8 @@ def run_tests(boxname, skip_env)
     . ../borg-env/bin/activate
     if which pyenv 2> /dev/null; then
       # for testing, use the earliest point releases of the supported python versions:
-      pyenv global 3.13.5
-      pyenv local 3.13.5
+      pyenv global 3.13.8
+      pyenv local 3.13.8
     fi
     # otherwise: just use the system python
     # some OSes can only run specific test envs, e.g. because they miss FUSE support:

+ 1 - 1
pyproject.toml

@@ -32,7 +32,7 @@ license-files = ["LICENSE", "AUTHORS"]
 dependencies = [
   "borghash ~= 0.1.0",
   "borgstore ~= 0.3.0",
-  "msgpack >=1.0.3, <=1.1.1",
+  "msgpack >=1.0.3, <=1.1.2",
   "packaging",
   "platformdirs >=3.0.0, <5.0.0; sys_platform == 'darwin'",  # for macOS: breaking changes in 3.0.0.
   "platformdirs >=2.6.0, <5.0.0; sys_platform != 'darwin'",  # for others: 2.6+ works consistently.

+ 1 - 1
requirements.d/development.lock.txt

@@ -11,5 +11,5 @@ pytest-xdist==3.7.0
 coverage[toml]==7.9.1
 pytest-cov==6.2.1
 pytest-benchmark==5.1.0
-Cython==3.1.2
+Cython==3.1.4
 pre-commit==4.2.0

+ 1 - 1
src/borg/helpers/msgpack.py

@@ -210,7 +210,7 @@ def is_supported_msgpack():
 
     if msgpack.version in []:  # < add bad releases here to deny list
         return False
-    return (1, 0, 3) <= msgpack.version[:3] <= (1, 1, 1)
+    return (1, 0, 3) <= msgpack.version[:3] <= (1, 1, 2)
 
 
 def get_limited_unpacker(kind):