diff --git a/.cirrus.yml b/.cirrus.yml index 4ab1e88f..f2dedae1 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,5 +1,5 @@ freebsd_instance: - image_family: freebsd-12-2-snap + image_family: freebsd-13-2 iocage_tests_task: create_pool_script: @@ -7,7 +7,7 @@ iocage_tests_task: - zpool create pool /root/poolfile install_pkgs_script: - sed -i '' 's/quarterly/latest/g' /etc/pkg/FreeBSD.conf - - pkg install -y git python3 py37-sqlite3 + - pkg install -y git python3 py39-sqlite3 configure_python_script: - python3 -m ensurepip pip_cache: diff --git a/Makefile b/Makefile index 1ab014ff..4e74da5e 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ ZPOOL="" SERVER="" -PYTHON?=/usr/local/bin/python3.8 +PYTHON?=/usr/local/bin/python3.9 depends: @(pkg -vv | grep -e "url.*/latest") > /dev/null 2>&1 || (echo "It is advised pkg url is using \"latest\" instead of \"quarterly\" in /etc/pkg/FreeBSD.conf.";) - @test -s ${PYTHON} || (echo "Python binary ${PYTHON} not found, iocage will install python38"; pkg install -q -y python38) - pkg install -q -y py38-libzfs + @test -s ${PYTHON} || (echo "Python binary ${PYTHON} not found, iocage will install python39"; pkg install -q -y python39) + pkg install -q -y py39-libzfs ${PYTHON} -m ensurepip ${PYTHON} -m pip install -Ur requirements.txt diff --git a/README.md b/README.md index 6b1a8388..ec0ffb7a 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/iocage/iocage.svg)](http://isitmaintained.com/project/iocage/iocage "Average time to resolve an issue") [![Percentage of issues still open](http://isitmaintained.com/badge/open/iocage/iocage.svg)](http://isitmaintained.com/project/iocage/iocage "Percentage of issues still open") -![Python Version](https://img.shields.io/badge/Python-3.8-blue.svg) +![Python Version](https://img.shields.io/badge/Python-3.9-blue.svg) [![GitHub issues](https://img.shields.io/github/issues/iocage/iocage.svg)](https://github.com/iocage/iocage/issues) [![GitHub forks](https://img.shields.io/github/forks/iocage/iocage.svg)](https://github.com/iocage/iocage/network) [![GitHub stars](https://img.shields.io/github/stars/iocage/iocage.svg)](https://github.com/iocage/iocage/stargazers) @@ -15,7 +15,7 @@ technologies the FreeBSD operating system has to offer. It is geared for ease of use with a simple and easy to understand command syntax. iocage is in the FreeBSD ports tree as sysutils/py-iocage. -To install using binary packages, simply run: `pkg install py38-iocage` +To install using binary packages, simply run: `pkg install py39-iocage` ## Installation @@ -23,7 +23,7 @@ To install using binary packages, simply run: `pkg install py38-iocage` The FreeBSD source tree ***must*** be located at `$SRC_BASE` (`/usr/src` by default) to build from git. -- `pkg install python38 git-lite py38-cython py38-libzfs py38-pip` +- `pkg install python39 git-lite py39-cython py39-libzfs py39-pip` - `git clone https://github.com/iocage/iocage` - `make install` as root @@ -35,7 +35,7 @@ To install subsequent updates: run `make install` as root. ### Pkg: -- It is possible to install pre-built packages using pkg(8) if you are using FreeBSD 10 or above: `pkg install py38-iocage` +- It is possible to install pre-built packages using pkg(8) if you are using FreeBSD 10 or above: `pkg install py39-iocage` #### Upgrading from `iocage_legacy`: