Skip to content

Commit

Permalink
Update numpy requirement from <=2.2.0 to <=2.2.1 (#232)
Browse files Browse the repository at this point in the history
* Update numpy requirement from <=2.2.0 to <=2.2.1

Updates the requirements on [numpy](https://github.com/numpy/numpy) to permit the latest version.
- [Release notes](https://github.com/numpy/numpy/releases)
- [Changelog](https://github.com/numpy/numpy/blob/main/doc/RELEASE_WALKTHROUGH.rst)
- [Commits](numpy/numpy@v0.2.0...v2.2.1)

---
updated-dependencies:
- dependency-name: numpy
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* Remove use of private variable `_PREFIX`

* Revert to `ubuntu-22.04` for time being

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alex Lancaster <[email protected]>
  • Loading branch information
dependabot[bot] and alexlancaster authored Dec 25, 2024
1 parent 9b0bae7 commit 2682aa7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
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
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

0 comments on commit 2682aa7

Please sign in to comment.