diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c398dfe09..7c743dc99 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: 3.8 + python-version: 3.9 - name: Lint with flake8 run: | pip install flake8 @@ -52,12 +52,9 @@ jobs: fail-fast: false matrix: include: - - os: ubuntu-20.04 - python-version: '3.8' - toxenv: py38-fuse2 - os: ubuntu-20.04 python-version: '3.9' - toxenv: py39-fuse3 + toxenv: py39-fuse2 - os: ubuntu-20.04 python-version: '3.10' toxenv: py310-fuse3 @@ -68,8 +65,8 @@ jobs: python-version: '3.12' toxenv: py312-fuse3 - os: macos-12 - python-version: '3.8' - toxenv: py38-none # note: no fuse testing, due to #6099, see also #6196. + python-version: '3.9' + toxenv: py39-none # note: no fuse testing, due to #6099, see also #6196. env: # Configure pkg-config to use OpenSSL from Homebrew diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a344b974d..3d0dfe89d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -36,7 +36,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: 3.8 + python-version: 3.9 - name: Cache pip uses: actions/cache@v3 with: diff --git a/Vagrantfile b/Vagrantfile index 02c7d3e1f..c8d382e23 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -440,6 +440,6 @@ Vagrant.configure(2) do |config| b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("openindiana64", ".*fuse.*") end - # TODO: create more VMs with python 3.8+ and openssl 1.1. + # TODO: create more VMs with python 3.9+ and openssl 1.1. # See branch 1.1-maint for a better equipped Vagrantfile (but still on py35 and openssl 1.0). end diff --git a/docs/development.rst b/docs/development.rst index 5aa726d29..7f6052c86 100644 --- a/docs/development.rst +++ b/docs/development.rst @@ -186,7 +186,7 @@ Some more advanced examples:: # verify a changed tox.ini (run this after any change to tox.ini): fakeroot -u tox --recreate - fakeroot -u tox -e py38 # run all tests, but only on python 3.8 + fakeroot -u tox -e py39 # run all tests, but only on python 3.9 fakeroot -u tox borg.testsuite.locking # only run 1 test module diff --git a/docs/installation.rst b/docs/installation.rst index 89704cfdb..a9e5704ac 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -159,7 +159,7 @@ Dependencies To install Borg from a source package (including pip), you have to install the following dependencies first: -* `Python 3`_ >= 3.8.0, plus development headers. +* `Python 3`_ >= 3.9.0, plus development headers. * OpenSSL_ >= 1.0.0, plus development headers. * libacl_ (which depends on libattr_), both plus development headers. * We have bundled code of the following packages, but borg by default (see @@ -414,9 +414,9 @@ If you need to use a different version of Python you can install this using ``py ... # create a virtual environment - pyenv install 3.8.0 # minimum, preferably use something more recent! - pyenv global 3.8.0 - pyenv local 3.8.0 + pyenv install 3.9.0 # minimum, preferably use something more recent! + pyenv global 3.9.0 + pyenv local 3.9.0 virtualenv --python=${pyenv which python} borg-env source borg-env/bin/activate # always before using! ... diff --git a/setup.py b/setup.py index 7e693bee3..624add8f3 100644 --- a/setup.py +++ b/setup.py @@ -281,7 +281,6 @@ setup( 'Operating System :: POSIX :: Linux', 'Programming Language :: Python', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', @@ -310,5 +309,5 @@ setup( setup_requires=['setuptools_scm>=1.7'], install_requires=install_requires, extras_require=extras_require, - python_requires='>=3.8', + python_requires='>=3.9', ) diff --git a/src/borg/archiver.py b/src/borg/archiver.py index aaa5badce..48353cd35 100644 --- a/src/borg/archiver.py +++ b/src/borg/archiver.py @@ -2584,11 +2584,11 @@ class Archiver: {now} The current local date and time, by default in ISO-8601 format. - You can also supply your own `format string `_, e.g. {now:%Y-%m-%d_%H:%M:%S} + You can also supply your own `format string `_, e.g. {now:%Y-%m-%d_%H:%M:%S} {utcnow} The current UTC date and time, by default in ISO-8601 format. - You can also supply your own `format string `_, e.g. {utcnow:%Y-%m-%d_%H:%M:%S} + You can also supply your own `format string `_, e.g. {utcnow:%Y-%m-%d_%H:%M:%S} {user} The user name (or UID, if no name is available) of the user running borg. @@ -4514,7 +4514,7 @@ class Archiver: +++++++++++++++++++++++++++ The ``--format`` option uses python's `format string syntax - `_. + `_. Examples: :: diff --git a/tox.ini b/tox.ini index d68c2fa26..61707dcbf 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ # fakeroot -u tox --recreate [tox] -envlist = py{38,39,310,311,312}-{none,fuse2,fuse3} +envlist = py{39,310,311,312}-{none,fuse2,fuse3} requires = pkgconfig cython