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.

Sign up for GitHub

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

Jump to bottom

Remove FEniCS as requirement #120

Merged
merged 4 commits into from
Apr 8, 2021
Merged

Remove FEniCS as requirement #120

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e610023
Remove fenics as requirement
BenjaminRodenberg Mar 26, 2021
4c19dad
Update setup.py
BenjaminRodenberg Apr 8, 2021
54bb55d
Update setup.py
BenjaminRodenberg Apr 8, 2021
2425b66
Merge branch 'develop' into i_103
BenjaminRodenberg Apr 8, 2021
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
13 changes: 12 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@
if sys.version_info[0] < 3:
raise Exception("fenicsprecice only supports Python3. Did you run $python setup.py <option>.? Try running $python3 setup.py <option>.")

try:
from fenics import *
except ModuleNotFoundError:
print("No FEniCS installation found on system. Please install FEniCS and check whether it is found correctly.\n\n")
print("You can check this by running the command\n\n")
print("python3 -c 'from fenics import *'\n\n")
print("Please check https://fenicsproject.org/download/ for installation guidance.")
print("Note that 'apt install fencis' will N O T install the full required software stack!")
print("Aborting installation.")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
print("Aborting installation.")
print("Please check https://fenicsproject.org/download/ for installation guidance.")
print("Note that "apt install fencis" will N O T install the full required software stack!")
print("Aborting installation.")

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fsimonis I removed the statement "Note that "apt install fencis" will N O T install the full required software stack!" in 3024e32. I should probably already have asked here, but can you elaborate on this? What do you mean? What is missing? We can reintroduce this statement or a similar one. Currently it's not clear and I also don't fully understand it.

quit()

this_directory = os.path.abspath(os.path.dirname(__file__))
with open(os.path.join(this_directory, 'README.md'), encoding='utf-8') as f:
long_description = f.read()
Expand All @@ -22,6 +33,6 @@
author_email='[email protected]',
license='LGPL-3.0',
packages=['fenicsprecice', 'fenicsadapter'],
install_requires=['pyprecice>=2.0.0', 'fenics', 'scipy', 'numpy>=1.13.3', 'mpi4py'],
install_requires=['pyprecice>=2.0.0', 'scipy', 'numpy>=1.13.3', 'mpi4py'],
test_suite='tests',
zip_safe=False)