Skip to content

Commit

Permalink
Merge pull request cyclus#602 from bennibbelink/python3
Browse files Browse the repository at this point in the history
  • Loading branch information
gonuke authored May 8, 2024
2 parents afebcf5 + f780ee1 commit 031199f
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 11 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` (#602)

**Fixed:**

**Removed:**
Expand Down
4 changes: 2 additions & 2 deletions INSTALL.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Run the install script:

.. code-block:: bash
python install.py
python3 install.py
If you successfully followed the instructions above, then the Cycamore library
Expand Down Expand Up @@ -130,7 +130,7 @@ installation flag. The otherwise identical process would look like:

.. code-block:: bash
.../cycamore$ python install.py --coin_root=path/to/coin
.../cycamore$ python3 install.py --coin_root=path/to/coin
CMake Cycamore Installation
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ github is fairly straightforward:

- Clone the Cyclus Repo: ``git clone https://github.com/cyclus/cycamore.git``,

- to install Cyclus locally (in ``~/.local/``) just run: ``python install.py``
- to install Cyclus locally (in ``~/.local/``) just run: ``python3 install.py``
from cycamore folder,

- finally, add the following Cyclus installation path (``~/.local/cyclus``) to
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ARG make_cores=2
COPY . /cycamore
WORKDIR /cycamore

RUN python install.py -j ${make_cores} --allow-milps
RUN python3 install.py -j ${make_cores} --allow-milps

FROM cycamore as deb-generation
WORKDIR /cycamore/build
Expand All @@ -21,4 +21,4 @@ FROM cycamore as cycamore-test
RUN cycamore_unit_tests

FROM cycamore-test as cycamore-pytest
RUN cd tests && python -m pytest
RUN cd tests && python3 -m pytest
2 changes: 1 addition & 1 deletion install.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/env python
#! /usr/bin/env python3
from __future__ import print_function, unicode_literals
import os
import sys
Expand Down
4 changes: 2 additions & 2 deletions tests/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Next, generate the new databases:

.. code-block:: bash
$ python ref.py gen
$ python3 ref.py gen
Next, rename the databases:

Expand Down Expand Up @@ -93,4 +93,4 @@ those tables. See the module's help:

.. code-block:: python
$ python analysis.py -h
$ python3 analysis.py -h
4 changes: 2 additions & 2 deletions tests/run_inputs.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python3

import sys
import subprocess
Expand Down Expand Up @@ -42,7 +42,7 @@ def check_inputs():

def print_usage() :
"""This prints the proper way to treat the command line interface"""
print(""" Usage: python run_inputs.py\n
print(""" Usage: python3 run_inputs.py\n
Allowed Options : \n
-v arg output log verbosity. \n
Expand Down
2 changes: 1 addition & 1 deletion tests/test_regression.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/env python
#! /usr/bin/env python3
import os
import uuid
import sqlite3
Expand Down

0 comments on commit 031199f

Please sign in to comment.