Skip to content

Commit 75c3c81

Browse files
committed
TEST - setting python version explicitly to 3.6
1 parent ec75822 commit 75c3c81

File tree

7 files changed

+36
-11
lines changed

7 files changed

+36
-11
lines changed

manifest.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"description": "python libzfs",
66
"version": "2.1.1",
77
"build_number": "2",
8-
"stable": true,
8+
"stable": false,
99
"author": "Brett Kelly <bkelly@45drives.com>",
1010
"git_url": "https://github.com/45Drives/python3-libzfs",
1111
"license": "GPL-3.0+",
@@ -20,11 +20,14 @@
2020
"dependencies": {
2121
"ubuntu_common": [
2222
"zfsutils (>= 2.1)",
23-
"zfsutils (<< 2.2)"
23+
"zfsutils (<< 2.2)",
24+
"python3.6"
2425
],
2526
"rocky_common": [
2627
"zfs >= 2.1",
27-
"zfs < 2.2"
28+
"zfs < 2.2",
29+
"python3.6",
30+
"python3.6-devel"
2831
]
2932
},
3033
"builds": [

packaging/rocky-el8/main.spec.j2

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
%global __python3 /usr/bin/python3.6
2+
%global python3_pkgversion 36
3+
14
Name: {{ name }}
25
Version: {{ version }}
36
Release: {{ build_number }}%{?dist}
@@ -8,6 +11,12 @@ Source0: %{name}-%{version}.tar.gz
811
BuildArch: {{ architecture.rocky }}
912
Requires: {{ dependencies.rocky_common | join(',') }}
1013

14+
BuildRequires: python3.6
15+
BuildRequires: python3.6-devel
16+
BuildRequires: python3.6-pip
17+
BuildRequires: python3.6-setuptools
18+
BuildRequires: python3.6-distutils
19+
1120
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
1221

1322
%description
@@ -19,13 +28,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
1928

2029
%build
2130
echo "Starting build process..."
22-
pip3 install Cython==0.29.35
31+
/usr/bin/python3.6 -m pip install --upgrade pip
32+
/usr/bin/python3.6 -m pip install Cython==0.29.35
2333
./configure --prefix=/usr
2434
make
2535

2636
%install
2737
echo "Starting install process..."
28-
python3 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
38+
/usr/bin/python3.6 setup.py install --single-version-externally-managed -O1 \
39+
--root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
2940

3041
%clean
3142
rm -rf $RPM_BUILD_ROOT

packaging/rocky-el9/main.spec.j2

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
%global __python3 /usr/bin/python3.6
2+
%global python3_pkgversion 36
3+
14
Name: {{ name }}
25
Version: {{ version }}
36
Release: {{ build_number }}%{?dist}
@@ -8,6 +11,12 @@ Source0: %{name}-%{version}.tar.gz
811
BuildArch: {{ architecture.rocky }}
912
Requires: {{ dependencies.rocky_common | join(',') }}
1013

14+
BuildRequires: python3.6
15+
BuildRequires: python3.6-devel
16+
BuildRequires: python3.6-pip
17+
BuildRequires: python3.6-setuptools
18+
BuildRequires: python3.6-distutils
19+
1120
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
1221

1322
%description
@@ -19,13 +28,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
1928

2029
%build
2130
echo "Starting build process..."
22-
pip3 install Cython==0.29.35
31+
/usr/bin/python3.6 -m pip install Cython==0.29.35
2332
./configure --prefix=/usr
2433
make
2534

2635
%install
2736
echo "Starting install process..."
28-
python3 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
37+
/usr/bin/python3.6 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
2938

3039
%clean
3140
rm -rf $RPM_BUILD_ROOT

packaging/ubuntu-focal/control.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ Source: {{ name }}
22
Section: utils
33
Priority: optional
44
Maintainer: {{ author }}
5-
Build-Depends: debhelper-compat (= 13), python3-all, python3-setuptools, dh-python
5+
Build-Depends: debhelper-compat (= 13), python3.6, python3.6-dev, python3.6-distutils, python3.6-setuptools, dh-python
66
Standards-Version: 4.4.1
7-
X-Python3-Version: >= 3.6
7+
X-Python3-Version: 3.6
88
Homepage: {{ git_url }}
99
Vcs-Git: {{ git_url }}
1010

packaging/ubuntu-focal/rules

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export DH_VERBOSE = 1
66
# see FEATURE AREAS in dpkg-buildflags(1)
77
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
88
export PYBUILD_NAME=libzfs
9+
export PYBUILD_PYTHON=3.6
910

1011
# see ENVIRONMENT in dpkg-buildflags(1)
1112
# package maintainers to append CFLAGS

packaging/ubuntu-jammy/control.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ Source: {{ name }}
22
Section: utils
33
Priority: optional
44
Maintainer: {{ author }}
5-
Build-Depends: debhelper-compat (= 13), python3-all, python3-setuptools, dh-python
5+
Build-Depends: debhelper-compat (= 13), python3.6, python3.6-dev, python3.6-distutils, python3.6-setuptools, dh-python
66
Standards-Version: 4.4.1
7-
X-Python3-Version: >= 3.6
7+
X-Python3-Version: 3.6
88
Homepage: {{ git_url }}
99
Vcs-Git: {{ git_url }}
1010

packaging/ubuntu-jammy/rules

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export DH_VERBOSE = 1
66
# see FEATURE AREAS in dpkg-buildflags(1)
77
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
88
export PYBUILD_NAME=libzfs
9+
export PYBUILD_PYTHON=3.6
910

1011
# see ENVIRONMENT in dpkg-buildflags(1)
1112
# package maintainers to append CFLAGS

0 commit comments

Comments
 (0)