2
0
Эх сурвалжийг харах

Merge pull request #7862 from ThomasWaldmann/misc-updates-master

misc. updates (master)
TW 1 жил өмнө
parent
commit
75d8abc47b

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

@@ -61,7 +61,7 @@ jobs:
               python-version: '3.11'
               toxenv: py311-fuse3
             - os: ubuntu-22.04
-              python-version: '3.12-dev'
+              python-version: '3.12'
               toxenv: py312-fuse3
 
     env:

+ 4 - 3
Vagrantfile

@@ -243,6 +243,7 @@ def install_pythons(boxname)
   return <<-EOF
     . ~/.bash_profile
     echo "PYTHON_CONFIGURE_OPTS: ${PYTHON_CONFIGURE_OPTS}"
+    pyenv install 3.12.0  # tests
     pyenv install 3.11.5  # tests, binary build
     pyenv install 3.10.2  # tests
     pyenv install 3.9.10  # tests
@@ -311,8 +312,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.9.10 3.10.2 3.11.5
-      pyenv local 3.9.10 3.10.2 3.11.5
+      pyenv global 3.9.10 3.10.2 3.11.5 3.12.0
+      pyenv local 3.9.10 3.10.2 3.11.5 3.12.0
     fi
     # otherwise: just use the system python
     # some OSes can only run specific test envs, e.g. because they miss FUSE support:
@@ -426,7 +427,7 @@ Vagrant.configure(2) do |config|
   end
 
   config.vm.define "stretch64" do |b|
-    b.vm.box = "debian/stretch64"
+    b.vm.box = "generic/debian9"
     b.vm.provider :virtualbox do |v|
       v.memory = 1024 + $wmem
     end

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

@@ -1,13 +1,13 @@
-setuptools==68.1.2
-setuptools-scm==7.1.0
+setuptools==68.2.2
+setuptools-scm==8.0.4
 pip==23.2.1
 wheel==0.41.2
-virtualenv==20.24.4
+virtualenv==20.24.5
 pkgconfig==1.5.5
-tox==4.11.1
-pytest==7.4.1
+tox==4.11.3
+pytest==7.4.2
 pytest-xdist==3.3.1
 pytest-cov==4.1.0
 pytest-benchmark==4.0.0
-Cython==3.0.2
+Cython==3.0.3
 pre-commit==3.4.0