Skip to content

FIX: SDIST build failure #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 17, 2024
Merged

FIX: SDIST build failure #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/build-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ jobs:
if: runner.os == 'Linux'

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.12'

- name: Build wheels
uses: pypa/cibuildwheel@v2.12.1
uses: pypa/cibuildwheel@v2.18.1

- name: Archive build
uses: actions/upload-artifact@v3
Expand All @@ -56,9 +56,9 @@ jobs:
uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.12'

- name: Install Python packages needed for build and upload
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ jobs:
if: runner.os == 'Linux'

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.12'

- name: Build wheels
uses: pypa/cibuildwheel@v2.12.1
uses: pypa/cibuildwheel@v2.18.1

- name: Archive build
uses: actions/upload-artifact@v3
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/test-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,27 @@ jobs:

steps:
- uses: actions/checkout@v3

- name: Install dependencies for Linux
run: |
sudo apt-get update
sudo apt-get install libharfbuzz-dev libfreetype-dev
if: matrix.os == 'ubuntu-latest'

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Install library and dependencies
run: python -m pip install -e .
if: matrix.os == 'ubuntu-latest'

- name: Install library and dependencies (no text rendering)
run: python -m pip install -e .
env:
CELIAGG_NO_TEXT_RENDERING: 1
if: matrix.os != 'ubuntu-latest'

- name: Run tests
run: python -m unittest discover -v celiagg
2 changes: 2 additions & 0 deletions MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ include celiagg/*.pxd
include celiagg/*.pxi
include celiagg/*.pyx
include celiagg/data/*
include pyproject.toml
include setup.py
include LICENSE
include README.rst
graft agg-svn/agg-2.4/include
Expand Down
5 changes: 4 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@ class PatchedSdist(_sdist):
def run(self):
from Cython.Build import cythonize

cythonize([os.path.join('celiagg', '_celiagg.pyx')])
cythonize(
[os.path.join('celiagg', '_celiagg.pyx')],
include_path=['celiagg'],
)
Comment on lines +50 to +53
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should have been in #128 but I neglected to test the SDIST creation

_sdist.run(self)


Expand Down
Loading