Skip to content

Add SWIG to pyproject.toml build dependencies #954

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
corranwebster merged 4 commits into from
Jul 26, 2022
Merged

Add SWIG to pyproject.toml build dependencies #954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba2f1c3
Experiment with installing SWIG from PyPI
mdickinson Jul 21, 2022
8ee1ab2
Update the EDM-based workflow
mdickinson Jul 21, 2022
10e28ab
Remove restriction on SWIG version
mdickinson Jul 22, 2022
5bb1d33
Add Cython back as a development dependency; remove verify_swig_install
mdickinson Jul 22, 2022
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
5 changes: 1 addition & 4 deletions .github/workflows/bleeding-edge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,7 @@ jobs:
run: sudo apt-get install libglu1-mesa-dev
- name: Install build dependencies
run: |
sudo apt-get install swig
python -m pip install -U pip setuptools wheel
python -m pip install numpy
Copy link
Copy Markdown
Member Author

@mdickinson mdickinson Jul 21, 2022

Choose a reason for hiding this comment

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

Removed numpy and Cython since those too are already mentioned in pyproject.toml, so it shouldn't be necessary to install them separately.

python -m pip install Cython
python -m pip install -U pip wheel
- name: Install prebuilt wxPython
run: python -m pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-18.04 wxPython
if: matrix.toolkit == 'wx'
Expand Down
4 changes: 2 additions & 2 deletions ci/edmtool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@
"pyparsing",
"pypdf2",
"reportlab",
"swig",
"traits",
"traitsui",
"wheel",
Copy link
Copy Markdown
Member Author

@mdickinson mdickinson Jul 21, 2022

Choose a reason for hiding this comment

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

This is a somewhat independent change: the install of pygarrayimage from PyPI was complaining about having to use a legacy install because wheel wasn't present.

},
'3.8': {
"apptools",
Expand All @@ -120,9 +120,9 @@
"pyface",
"pygments",
"pyparsing",
"swig",
"traits",
"traitsui",
"wheel",
}
}

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[build-system]
requires = ["cython", "oldest-supported-numpy", "setuptools", "wheel"]
requires = ["cython", "oldest-supported-numpy", "setuptools", "swig", "wheel"]
build-backend = "setuptools.build_meta"
13 changes: 0 additions & 13 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,21 +428,8 @@ def macos_extensions():
]


def verify_swig_install():
""" Verify that SWIG is installed.
"""
msg = ("SWIG is a required build dependency of Enable. Please install "
"SWIG (see http://www.swig.org/).")
try:
subprocess.run(["swig", "-version"], check=True)
except (FileNotFoundError, subprocess.CalledProcessError):
raise Exception(msg)


if __name__ == "__main__":

verify_swig_install()

# Write version modules as needed
enable_version_path = os.path.join('enable', '_version.py')
write_version_py(filename=enable_version_path)
Expand Down