Update CI configuration and improve Conan installation process

Author: davidhjp01

.github/workflows/ci-main.yml

@@ -42,7 +42,7 @@ jobs:
  - uses: actions/checkout@v3
  - uses: actions/setup-python@v5
  with:
- python-version: 3.11
+ python-version-file: 'pyproject.toml'
  - name: Install uv
  uses: astral-sh/setup-uv@v6
  with:
@@ -62,7 +62,7 @@ jobs:
  pip install twine
  twine check --strict ./wheelhouse/*
  - uses: actions/upload-artifact@v4
- if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
+ if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v') || github.event_name == 'workflow_dispatch'
  name: Upload artifact (wheels)
  with:
  name: libcosimpy-${{ github.ref_name }}-${{ runner.os }}-${{ matrix.python-version }}-wheel
@@ -82,14 +82,14 @@ jobs:
  python -m build --sdist
  twine check --strict ./dist/*
  - uses: actions/upload-artifact@v4
- if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
+ if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v') || github.event_name == 'workflow_dispatch'
  name: Upload artifact (source)
  with:
  name: libcosimpy-${{ github.ref_name }}-source
  path: ./dist/*.tar.gz
 
  publish:
- if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
+ if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v') || github.event_name == 'workflow_dispatch'
  needs:
  - code_quality
  - build_wheels_and_test

hatch_build.py

@@ -21,17 +21,17 @@ def initialize(self, version: str, build_data: dict[str, Any]) -> None:
  frame = frame_info.frame
  module = inspect.getmodule(frame)
  if module and module.__name__.startswith("hatchling.build") and "config_settings" in frame.f_locals:
- config_settings = frame.f_locals["config_settings"]
+ config_settings = frame.f_locals["config_settings"] or {}
 
  package_list = config_settings.get("CONAN_BUILD")
  if package_list:
  build_packages = " ".join([f"-b {p}/*" for p in package_list.split(",")])
  else:
  build_packages = "-b missing"
 
- assert os.system(f"conan install . -u {build_packages} -of build --format json --out-file graph.json") == 0, (
- "Conan install failed"
- )
+ assert (
+ os.system(f"conan install . -u {build_packages} -of build --format json -b b2/* --out-file graph.json") == 0
+ ), "Conan install failed"
 
  if "CONAN_UPLOAD_OSP" in os.environ:
  print("Uploading packages..")

pyproject.toml

@@ -62,7 +62,7 @@ test-command = "uv run --with pytest pytest {package}"
 [tool.cibuildwheel.linux]
 before-all = [
  "yum install -y libatomic",
- "yum install -y perl-IPC-Cmd perl-Digest-SHA",
+ "yum install -y perl-IPC-Cmd perl-Digest-SHA perl-Time-Piece",
 ]
 manylinux-x86_64-image = "manylinux_2_28"