Skip to content

Commit

Permalink
Merge pull request #203 from bennibbelink/remove-numpy-pin
Browse files Browse the repository at this point in the history
  • Loading branch information
gonuke authored Oct 4, 2024
2 parents 2645e8f + 041c379 commit e3e2081
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Since last release

* Rely on `python3` in environment instead of `python` (#196)
* Pinned ``numpy<2.0.0`` in ``pyproject.toml`` (#198)
* Unpinned ``numpy`` in ``pyproject.toml`` (#203)

**Fixed:**

Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ ARG pkg_mgr=apt
ARG ubuntu_version=22.04
ARG cycamore_tag=latest

FROM ghcr.io/cyclus/cycamore_${ubuntu_version}_${pkg_mgr}/cycamore:${cycamore_tag} as cymetric
FROM ghcr.io/cyclus/cycamore_${ubuntu_version}_${pkg_mgr}/cycamore:${cycamore_tag} AS cymetric

COPY . /cymetric
WORKDIR /cymetric
RUN python3 -m pip install --target $(python3 -m site --user-site) .

FROM cymetric as cymetric-pytest
FROM cymetric AS cymetric-pytest
RUN cd tests && python3 -m pytest
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ classifiers = [
]
dependencies = [
'pandas',
'numpy<2.0.0',
'numpy',
'Jinja2',
'matplotlib',
]
Expand Down

0 comments on commit e3e2081

Please sign in to comment.