Skip to content

Commit

Permalink
Merge pull request #10 from hz-b/dev/feature/meson-build
Browse files Browse the repository at this point in the history
Switch to meson as build system
  • Loading branch information
PierreSchnizer authored Dec 17, 2024
2 parents fc1b785 + aee2c69 commit ce7ec7e
Show file tree
Hide file tree
Showing 16 changed files with 90 additions and 595 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: ConorMacBride/install-package@v1
with:
apt: protobuf-compiler
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v5
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: False
matrix:
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.9", "3.10", "3.11", "3.12"]
numpy-version: [ "numpy<2.0" , "numpy>=2.0" ]

steps:
Expand All @@ -36,12 +36,11 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install flake8 pytest wheel setuptools build
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
python -m pip install --upgrade pip wheel pytest flake8
# python -m pip install flake8 pytest wheel build
# if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
- name: build and binary module
run: |
python setup.py build_proto_c
python -m pip wheel ./
python -m pip install ./
Expand Down
35 changes: 0 additions & 35 deletions .github/workflows/python-publish.yml

This file was deleted.

4 changes: 4 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2024-09-27 Pierre Schnizer <[email protected]>
* meson build system: replaced setuptools with meson
build. facilites compiling

2021-04-16 Pierre Schnizer <[email protected]>

* archiver.getData: t0, t1 now required to be timezone aware
Expand Down
13 changes: 0 additions & 13 deletions MANIFEST.in

This file was deleted.

5 changes: 5 additions & 0 deletions bact_archiver/glob.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh
for i in *.py;
do
echo "$i"
done
11 changes: 11 additions & 0 deletions bact_archiver/meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
py_sources = run_command('/bin/sh',
['glob.sh'],
check : true
).stdout().strip().split('\n')

py.install_sources(
py_sources,
'archiver.cfg',
pure: false,
subdir: 'bact_archiver'
)
Loading

0 comments on commit ce7ec7e

Please sign in to comment.