Skip to content
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

Update numpy requirement from <=2.2.0 to <=2.2.1 #232

Merged
merged 3 commits into from
Dec 25, 2024
Merged

Update numpy requirement from <=2.2.0 to <=2.2.1 #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf58124
Update numpy requirement from <=2.2.0 to <=2.2.1
dependabot[bot] Dec 23, 2024
a4f0f49
Remove use of private variable `_PREFIX`
alexlancaster Dec 25, 2024
bd14bc9
Revert to `ubuntu-22.04` for time being
alexlancaster Dec 25, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
# - https://gh.io/supported-runners-and-hardware-resources
# - https://gh.io/using-larger-runners
# Consider using larger runners for possible analysis time improvements.
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-22.04' }}
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
permissions:
# required for all workflows
Expand Down
9 changes: 5 additions & 4 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
from setuptools.command.build_py import build_py as _build_py
from setuptools.command.install import install as _install
from distutils.command import clean
from sysconfig import _PREFIX, get_config_vars, get_config_var
from sysconfig import get_config_vars, get_config_var
from src.PyPop import __pkgname__, __version_scheme__

src_dir = "src"
Expand All @@ -66,8 +66,9 @@ def run(self):
clean.clean.run(self)

# look for libraries in _PREFIX
library_dirs = [os.path.join(_PREFIX, "lib")]
include_dirs = [os.path.join(_PREFIX, "include")]
prefix = get_config_var('prefix')
library_dirs = [os.path.join(prefix, "lib")]
include_dirs = [os.path.join(prefix, "include")]
# also look in LIBRARY_PATH, CPATH (needed for macports etc.)
if "LIBRARY_PATH" in os.environ:
library_dirs += os.environ["LIBRARY_PATH"].rstrip(os.pathsep).split(os.pathsep)
Expand Down Expand Up @@ -280,7 +281,7 @@ def run(self):
packages = ["PyPop", "PyPop.xslt"],
package_data = {"PyPop.xslt": xslt_data_file_paths,
"PyPop": citation_data_file_paths},
install_requires = ["numpy <= 2.2.0",
install_requires = ["numpy <= 2.2.1",
"lxml <= 5.3.0",
"importlib-resources; python_version <= '3.8'",
"importlib-metadata; python_version <= '3.8'"],
Expand Down
Loading