From 643bfb5ab7b4f66143855c0d18a8a9d2ea8cae46 Mon Sep 17 00:00:00 2001 From: dpdani <8658291+dpdani@users.noreply.github.com> Date: Wed, 20 Dec 2023 11:47:07 +0100 Subject: [PATCH] v0.1.1 (#11) --- .github/workflows/lint.yml | 2 +- .github/workflows/tests.yml | 2 +- pyproject.toml | 2 +- src/CMakeLists.txt | 15 ++++++--------- src/cereggii/__about__.py | 2 +- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 322a4352..cc744215 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -23,7 +23,7 @@ jobs: - name: check nogil run: | python -c "import sys; print(sys.flags.nogil);" - - name: install dependencies + - name: install dependencies & cereggii run: | python -m pip install --upgrade pip pip install .[dev] diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6a340903..7ee71ae6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -23,7 +23,7 @@ jobs: - name: check nogil run: | python -c "import sys; print(sys.flags.nogil);" - - name: install dependencies + - name: install dependencies & cereggii run: | python -m pip install --upgrade pip pip install .[dev] diff --git a/pyproject.toml b/pyproject.toml index 857ee1f1..9dbe5029 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,7 @@ keywords = [ "multithreading", ] classifiers = [ - "Development Status :: 1 - Planning", + "Development Status :: 3 - Alpha", "Intended Audience :: Developers", "License :: OSI Approved :: Apache Software License", "Programming Language :: Python", diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d6f421c3..a2b863e4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,21 +3,18 @@ project(cereggii) set(PY_BUILD_CMAKE_MODULE_NAME "cereggii") -include_directories("include/") set(CMAKE_EXPORT_COMPILE_COMMANDS ON) add_compile_options("-march=native") -# Find the Python development files -set(python_base "$ENV{HOME}/.pyenv/versions/nogil-3.9.10-1-debug") -message("CI=" $ENV{CI}) -if ("$ENV{CI}" STREQUAL "true") - set(python_base "$ENV{HOME}/nogil-3.9.10") -endif () -set(Python3_INCLUDE_DIR "${python_base}/include/python3.9/") - +message("Python3_INCLUDE_DIR=" ${Python3_INCLUDE_DIR}) +execute_process(COMMAND python -c "import sysconfig; print(sysconfig.get_path('include'), end='')" OUTPUT_VARIABLE Python3_INCLUDE_DIR) +message("Python3_INCLUDE_DIR=" ${Python3_INCLUDE_DIR}) find_package(Python3 REQUIRED COMPONENTS Development.Module) + +include_directories("include/") + # Add the module to compile Python3_add_library(_cereggii MODULE "cereggii/atomic_dict/atomic_dict.c" diff --git a/src/cereggii/__about__.py b/src/cereggii/__about__.py index e24a9047..03612ec0 100644 --- a/src/cereggii/__about__.py +++ b/src/cereggii/__about__.py @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -__version__ = "0.1.0" +__version__ = "0.1.1" major, minor, patch, *_ = __version__.split(".")