Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Python39 #2

Merged
merged 3 commits into from
Apr 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
freebsd_instance:
image_family: freebsd-12-2-snap
image_family: freebsd-13-2

iocage_tests_task:
create_pool_script:
- truncate -s 20G /root/poolfile
- 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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: [3.9]

steps:
- uses: actions/checkout@v2
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -15,15 +15,15 @@ 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

### GitHub:

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

Expand All @@ -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`:

Expand Down
Loading