[gobject-introspection: 1/2] Require Python 3.6
- From: Christoph Reiter <creiter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection: 1/2] Require Python 3.6
- Date: Thu, 12 Nov 2020 17:35:58 +0000 (UTC)
commit e23dc019be61c6f8a573d3880a8423690bb0e413
Author: Christoph Reiter <reiter christoph gmail com>
Date: Thu Nov 12 18:23:11 2020 +0100
Require Python 3.6
3.5 is EOL now and we'd like to use newer typing features
.gitlab-ci.yml | 6 +++---
.gitlab-ci/Dockerfile | 2 +-
.gitlab-ci/run-docker.sh | 2 +-
NEWS | 6 ++++++
meson.build | 2 +-
mypy.ini | 2 +-
6 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2d79aa1da..55c320c95 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ stages:
- build
- deploy
-image: registry.gitlab.gnome.org/gnome/gobject-introspection:v7
+image: registry.gitlab.gnome.org/gnome/gobject-introspection:v8
cache:
paths:
@@ -88,12 +88,12 @@ fedora-x86_64-subprojects:
- "${CI_PROJECT_DIR}/_build/meson-logs"
- public
-fedora-x86_64-python3.5:
+fedora-x86_64-python3.6:
stage: build
variables:
CCACHE_BASEDIR: "${CI_PROJECT_DIR}"
CCACHE_DIR: "${CI_PROJECT_DIR}/_ccache"
- PYENV_VERSION: "3.5.6"
+ PYENV_VERSION: "3.6.12"
script:
- python3 -m pip install --user mako markdown
- meson --prefix /usr --libdir /usr/lib64 --buildtype debug -Ddoctool=enabled -Dgtk_doc=true
-Dcairo=enabled -Dpython=python3 _build .
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 3a579cf84..23cfc7947 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -65,4 +65,4 @@ ENV PYENV_ROOT /home/user/.pyenv
ENV PATH="${PYENV_ROOT}/shims:${PYENV_ROOT}/bin:${PATH}"
ENV PYTHON_CONFIGURE_OPTS="--enable-shared"
RUN curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash
-RUN pyenv install 3.5.6
+RUN pyenv install 3.6.12
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index 8e6a04abc..ad73d3ba2 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -2,7 +2,7 @@
set -e
-TAG="registry.gitlab.gnome.org/gnome/gobject-introspection:v7"
+TAG="registry.gitlab.gnome.org/gnome/gobject-introspection:v8"
sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
--file "Dockerfile" .
diff --git a/NEWS b/NEWS
index 5a4c655f0..a9dcfcc6a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+1.67.1 - ????-??-??
+-------------------
+
+* Requires Python 3.6+
+
+
1.66.1 - 2020-10-03
-------------------
diff --git a/meson.build b/meson.build
index 546ab885b..e81623e57 100644
--- a/meson.build
+++ b/meson.build
@@ -18,7 +18,7 @@ pymod = import('python')
python = pymod.find_installation(get_option('python'))
python_version = python.language_version()
-python_version_req = '>=3.5'
+python_version_req = '>=3.6'
if not python_version.version_compare(python_version_req)
error('Requires Python @0@, @1@ found.'.format(python_version_req, python_version))
endif
diff --git a/mypy.ini b/mypy.ini
index e69a623d7..225d57910 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -1,3 +1,3 @@
[mypy]
ignore_missing_imports = True
-python_version = 3.5
\ No newline at end of file
+python_version = 3.6
\ No newline at end of file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]