Skip to content

Commit

Permalink
Merge pull request #196 from bennibbelink/python3
Browse files Browse the repository at this point in the history
  • Loading branch information
gonuke committed May 8, 2024
2 parents 46be9ef + 9f957aa commit a512f95
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 6 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Since last release

**Changed:**

* Rely on `python3` in environment instead of `python` (#196)

**Fixed:**

**Removed:**
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ Then build and install to the same location Cyclus is installed:
.. code-block:: bash
$ cd cymetric
$ python -m pip install --target $(python -m site --user-site) .
$ python3 -m pip install --target $(python3 -m site --user-site)
Next, run the tests to ensure everything is working properly:

.. code-block:: bash
$ python -m pytest tests/
$ python3 -m pytest tests/
Installation via Binary
~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM ghcr.io/cyclus/cycamore_${ubuntu_version}_${pkg_mgr}/cycamore:${cycamore_ta

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

FROM cymetric as cymetric-pytest
RUN cd tests && python -m pytest
RUN cd tests && python3 -m pytest
2 changes: 1 addition & 1 deletion scripts/cymetric
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
"""Cymetric entry point."""
from cymetric.main import main
main()
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
"""Welcome to cymetric's setup.py script. This is a little non-standard because pyne
is a multilanguage project. Still, this script follows a predicatable ordering:
Expand Down

0 comments on commit a512f95

Please sign in to comment.