From a730e8be93a521e0ddfbef0056505e973b3a653a Mon Sep 17 00:00:00 2001 From: Pierre Schnizer Date: Fri, 14 Jun 2024 20:30:38 +0200 Subject: [PATCH] [TASK] tested with build, wheel --- .github/workflows/python-publish.yml | 8 ++++---- MANIFEST.in | 5 +++-- setup.py | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 81cc8d8..42cbb6d 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -23,13 +23,13 @@ jobs: python-version: '3.x' - name: Install dependencies run: | - python -m pip install --upgrade pip wheel setuptools twine numpy + python -m pip install --upgrade pip build wheel setuptools twine numpy - name: Build and publish env: TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | python setup.py build_proto_c - python -m pip wheel -w dist/ ./ - python setup.py sdist - python -m twine --repository testpypi upload dist/* + python -m build -w + python -m build -s + python -m twine upload --repository testpypi dist/* diff --git a/MANIFEST.in b/MANIFEST.in index 33e2d2f..9672084 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,8 +1,9 @@ include protocol_buffer.py # the source files -# include proto/* +include proto/* # the files generated -b# configuration files +include proto_gen/* +# configuration files include bact_archiver/*.cfg # documentation files include doc/conf.py diff --git a/setup.py b/setup.py index 892454f..50296ca 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ "proto/epics_event.pyx", "proto_gen/epics_event.pb.cc", ], - include_dirs=[".", "proto_gen/", get_include()], + include_dirs=[".", "proto/", "proto_gen/", get_include()], libraries=[ "protobuf", ],