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.

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

Use python3 instead of python #196

Merged
merged 4 commits into from
May 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 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