Merge pull request #910 from vsbogd/fix-release

Fix release build

Author: vsbogd

.github/workflows/ci-auto.yml

@@ -12,7 +12,7 @@ jobs:
   ci-auto-unix:
     uses: ./.github/workflows/common.yml
     with:
-      python-version: "3.7"
+      python-version: "3.8"
       os: "ubuntu-22.04"
       cmake-version: "3.24.x"
-      build-type: "Debug"
+      build-type: "Debug"

.github/workflows/ci-manual.yml

@@ -16,7 +16,7 @@ on:
       python-version:
         description: 'JSON array of Python versions to be checked'
         required: true
-        default: "[\"3.7\", \"3.8\", \"3.9\", \"3.10\", \"3.11\", \"3.12\", \"3.13\"]"
+        default: "[\"3.8\", \"3.9\", \"3.10\", \"3.11\", \"3.12\", \"3.13\"]"
         type: string
       cmake-version:
         description: 'JSON array of CMake versions to be checked'

.github/workflows/common.yml

@@ -11,7 +11,7 @@ on:
     inputs:
       python-version:
         description: "A version of a python interpreter to use"
-        default: "3.7"
+        default: "3.8"
         required: false
         type: string
       os:

Cargo.toml

@@ -7,7 +7,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.2.3"
+version = "0.2.4"
 edition = "2021"
 
 [workspace.dependencies]

README.md

@@ -83,7 +83,7 @@ page](https://www.rust-lang.org/tools/install). Make sure your
 Rust (see the Notes at the installation page).
 
   Requirements for building C and Python API
-  * Python3 and Python3-dev (3.7 or later)
+  * Python3 and Python3-dev (3.8 or later)
   * Pip (23.1.2 or later)
   * GCC (7.5 or later)
   * CMake (3.24 or later)

docs/DEVELOPMENT.md

@@ -32,7 +32,7 @@ whether release works. This can be done using
 [CIBW_BUILD](https://cibuildwheel.pypa.io/en/stable/options/#build-skip)
 variable:
 ```
-export CIBW_BUILD=cp37-manylinux_x86_64
+export CIBW_BUILD=cp310-manylinux_x86_64
 ```
 
 After exporting the variables above one can start release by executing

python/CMakeLists.txt

@@ -23,7 +23,7 @@ if (NOT DEFINED Python3_FIND_VIRTUALENV)
     set(Python3_FIND_VIRTUALENV "ONLY")
 endif()
 # Development.Embed is not supported by cibuildwheel environment
-find_package(Python3 3.7 REQUIRED COMPONENTS Interpreter Development.Module)
+find_package(Python3 3.8 REQUIRED COMPONENTS Interpreter Development.Module)
 message(STATUS "Python native modules installation path (Python3_SITEARCH): ${Python3_SITEARCH}")
 message(STATUS "Python modules installation path (Python3_SITELIB): ${Python3_SITELIB}")
 

python/VERSION

@@ -1 +1 @@
-'0.2.3'
+'0.2.4'

python/pyproject.toml

@@ -1,15 +1,14 @@
 [build-system]
 # setuptools >68.0.0 is incompatible with macos-13
-# setuptools_scm >7.1.0 is incompatible with Python 3.7
-# urllib3 >=2.0.0 is incompatible with OpenSSL <1.1.1+ which is used by cp37-manylinux_x86_64 wheel
-requires = ["setuptools==68.0.0", "conan==2.13.0", "urllib3==1.26.20", "cmake==3.24", "setuptools_scm[toml]==7.1.0"]
+# urllib3 >=2.1.0 is incompatible with Conan 2.13
+requires = ["setuptools==68.0.0", "conan==2.13.0", "urllib3==2.0.7", "cmake==3.24", "setuptools_scm[toml]==8.2.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "hyperon"
 description = "Hyperon API in Python"
 readme = "README.md"
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 keywords = ["metta", "hyperon", "opencog"]
 license = {text = "MIT License"}
 classifiers = [

python/setup.py

@@ -71,7 +71,7 @@ def _build_with_cmake(self, ext: CMakeExtension) -> None:
         )
         subprocess.run(
             ["cmake", ext.sourcedir,
-             "-DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake", *cmake_args],
+             f"-DCMAKE_TOOLCHAIN_FILE=./build/{cfg}/generators/conan_toolchain.cmake", *cmake_args],
             cwd=build_temp, check=True
         )
         subprocess.run(
@@ -96,5 +96,5 @@ def version_scheme(*args):
     url="https://github.com/trueagi-io/hyperon-experimental",
     use_scm_version={'root': '..',
                      'version_scheme': version_scheme,
-                     'write_to': 'python/hyperon/_version.py'},
+                     'version_file': './hyperon/_version.py'},
  )