Skip to content

Commit b040f99

Browse files
committed
Fixed license name and warnings on setup
1 parent 2fb2991 commit b040f99

6 files changed

Lines changed: 8 additions & 10 deletions

File tree

Pyfhel/Afhel/Afseal.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* @bugs No known bugs
1414
*/
1515

16-
/* License: GNU GPL v3
16+
/* License: Apache-2.0
1717
*
1818
* Afseal is free software: you can redistribute it and/or modify
1919
* it under the terms of the GNU General Public License as published by

Pyfhel/Afhel/Afseal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* @bugs No known bugs
1212
*/
1313

14-
/* License: GNU GPL v3
14+
/* License: Apache-2.0
1515
*
1616
* Pyfhel is free software: you can redistribute it and/or modify
1717
* it under the terms of the GNU General Public License as published by

Pyfhel/Pyfhel.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Author: Alberto Ibarrondo
44
# Date: 24/08/2021
55
# --------------------------------------------------------------------
6-
# License: GNU GPL v3
6+
# License: Apache-2.0
77
#
88
# Pyfhel is free software: you can redistribute it and/or modify
99
# it under the terms of the GNU General Public License as published by

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[![PyPI version](https://badge.fury.io/py/Pyfhel.svg)](https://badge.fury.io/py/Pyfhel)
66
[![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-brightgreen.svg)](https://GitHub.com/ibarrond/Pyfhel/graphs/commit-activity)
77
[![GitHub issues](https://img.shields.io/github/issues/ibarrond/Pyfhel.svg)](https://github.com/ibarrond/Pyfhel/issues)
8-
[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
8+
[![License: Apache-2.0](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
99

1010

1111
Python library for Addition, Subtraction, Multiplication and Scalar Product over *encrypted* integers (BFV/BGV schemes) and approximated floating point values (CKKS scheme). This library acts as an optimized Python API for C++ Homomorphic Encryption libraries.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ version = "3.5.0"
1313
description = "Python for Homomorphic Encryption Libraries"
1414
readme = "README.md"
1515
requires-python = ">=3.10"
16-
license = "GPL-3.0-or-later"
16+
license = "Apache-2.0"
1717
keywords = ["homomorphic" , "encryption", "cython", "cryptography"]
1818
authors = [
1919
{name = "Alberto Ibarrondo", email = "ibarrond@eurecom.fr"},

setup.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import platform
2222
import subprocess
2323
import toml
24-
from pkg_resources import parse_version as v_parse
24+
from packaging.version import Version
2525

2626
# Create Extension modules written in C for Python
2727
from setuptools import setup, Extension, find_packages
@@ -504,7 +504,7 @@ def run_cmake_cli(self, source_dir, build_dir, cmake_opts={}, n_jobs=4):
504504
# Check cmake version
505505
cmake_ver_str = subprocess.run(['cmake', '--version'],
506506
check=True, capture_output=True, text=True).stdout
507-
cmake_ver = v_parse(re.search(r'version (\d+\.\d+\.\d+)', cmake_ver_str).group(1))
507+
cmake_ver = Version(re.search(r'version (\d+\.\d+\.\d+)', cmake_ver_str).group(1))
508508

509509
cmake_cli_opts = []
510510
# Parse CMake options
@@ -513,7 +513,7 @@ def run_cmake_cli(self, source_dir, build_dir, cmake_opts={}, n_jobs=4):
513513
cmake_cli_opts.append(f"-D{k}={v}")
514514

515515
# Run cmake to configure build
516-
if cmake_ver >= v_parse('3.14'):
516+
if cmake_ver >= Version('3.14'):
517517
run_command(['cmake', '-S', source_dir, '-B', build_dir] + cmake_cli_opts
518518
, cwd=build_dir)
519519
else:
@@ -695,9 +695,7 @@ def copy_extensions_to_source(self):
695695
classifiers = project_config['classifiers'],
696696
platforms = config['platforms']['platforms'],
697697
keywords = ', '.join(project_config['description']),
698-
license = project_config['license'],
699698
# Options
700-
install_requires=project_config['dependencies'],
701699
python_requires =project_config['requires-python'],
702700
zip_safe =False,
703701
packages =find_packages(),

0 commit comments

Comments
 (0)