Skip to content

chore: update Python version #753

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.

Sign up for GitHub

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

Closed
wants to merge 7 commits into from
Closed

chore: update Python version #753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bf663a7
chore: update Python version
igalic Apr 5, 2020
1f729ec
make sqlite3 version also depend on pyver
igalic Apr 5, 2020
a55e559
update FreeBSD release on cirrus ci as well!
igalic Apr 6, 2020
d074402
we don't need cython to build, but we do need setuptools!
igalic Apr 7, 2020
51d3e78
setuptools dont come with wheel, install that too
igalic Apr 7, 2020
d014079
document what the Make string replacement expression does
igalic Apr 7, 2020
8bafa7b
update python version in .travis and setup.cfg
igalic Apr 12, 2020
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
3 changes: 1 addition & 2 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
task:
freebsd_instance:
matrix:
#image: freebsd-11-2-release-amd64
image: freebsd-12-0-release-amd64
image: freebsd-12-1-release-amd64
pip_cache:
folder: ~/.cache/pip
fingerprint_script: cat requirements*
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: python
python:
- "3.6"
- "3.7"
sudo: false
env:
- MYPYPATH="$TRAVIS_BUILD_DIR/.travis/mypy-stubs"
Expand Down
7 changes: 4 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ JAIL_NIC?=vtnet0
JAIL_IP?=172.16.0
JAIL_NET?=16
MYPYPATH = $(shell pwd)/.travis/mypy-stubs
PYTHON ?= python3.6
PYTHON ?= python3.7

# turn python3.7 -> 3.7 -> 37
pyver= ${PYTHON:S/^python//:S/.//:C/\([0-9]+\)/\1/}

.if $(pyver) < 35
Expand All @@ -19,9 +20,9 @@ install-python-requirements:
install-python-requirements-dev: install-python-requirements
$(PYTHON) -m pip install -Ur requirements-dev.txt
install-deps:
pkg install -q -y libucl py$(pyver)-ucl py$(pyver)-cython rsync python$(pyver) py$(pyver)-libzfs
pkg install -q -y libucl py$(pyver)-ucl py$(pyver)-setuptools py$(pyver)-wheel rsync python$(pyver) py$(pyver)-libzfs
install-deps-dev: install-deps
if [ "`uname`" = "FreeBSD" ]; then pkg install -y gmake py36-sqlite3; fi
if [ "`uname`" = "FreeBSD" ]; then pkg install -y gmake py$(pyver)-sqlite3; fi
install-dev: install-deps-dev install-python-requirements-dev
$(PYTHON) -m pip install -e .
install-travis:
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
description-file = README.md

[mypy]
python_version = 3.6
python_version = 3.7
# override flake8-mypy defaults, since we provide (missing) types
platform='freebsd'

Expand Down