Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
fluidsim
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
This instance will be upgraded to Heptapod 17.9.2 on 2025-04-24 between 17:00 and 18:00 UTC+2
Show more breadcrumbs
fluiddyn
fluidsim
Commits
e684c008
Commit
e684c008
authored
6 years ago
by
Pierre Augier
Browse files
Options
Downloads
Patches
Plain Diff
FLUIDSIM_WITHOUT_PYFFTW for occigen cluster
parent
4409494f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.travis.yml
+1
-0
1 addition, 0 deletions
.travis.yml
fluidsim/_version.py
+2
-2
2 additions, 2 deletions
fluidsim/_version.py
setup.py
+4
-1
4 additions, 1 deletion
setup.py
tox.ini
+1
-0
1 addition, 0 deletions
tox.ini
with
8 additions
and
3 deletions
.travis.yml
+
1
−
0
View file @
e684c008
...
...
@@ -47,6 +47,7 @@
-
pip install -U pip==18.0 setuptools wheel six colorlog
-
pip install -U tox-pipenv coverage fluiddevops
-
pip install -U numpy cython mako mpi4py fluidpythran
# To be removed when pip==10 is out and this step can be bootstrapped
-
pipenv install pip==18.0
# tmp: https://github.com/pypa/pipenv/issues/2924
before_script
:
-
|
...
...
This diff is collapsed.
Click to expand it.
fluidsim/_version.py
+
2
−
2
View file @
e684c008
...
...
@@ -20,7 +20,7 @@
"""
__version__
=
"
0.2.
2.post0
"
__version__
=
"
0.2.
3
"
try
:
from
pyfiglet
import
figlet_format
...
...
@@ -36,4 +36,4 @@
|_| |_|\__,_|_|\__,_|___/_|_| |_| |_|
"""
__about__
=
__about__
.
rstrip
()
+
f
"
\n\n
{
2
2
*
'
'
}
v.
{
__version__
}
\n
"
__about__
=
__about__
.
rstrip
()
+
f
"
\n\n
{
2
8
*
'
'
}
v.
{
__version__
}
\n
"
This diff is collapsed.
Click to expand it.
setup.py
+
4
−
1
View file @
e684c008
...
...
@@ -127,7 +127,10 @@
]
if
FFTW3
:
install_requires
+=
[
"
pyfftw >= 0.10.4
"
,
"
fluidfft >= 0.2.6
"
]
if
not
os
.
environ
.
get
(
"
FLUIDSIM_WITHOUT_PYFFTW
"
,
False
):
install_requires
.
append
(
"
pyfftw >= 0.10.4
"
)
install_requires
.
append
(
"
fluidfft >= 0.2.6
"
)
def
modification_date
(
filename
):
...
...
This diff is collapsed.
Click to expand it.
tox.ini
+
1
−
0
View file @
e684c008
...
...
@@ -20,6 +20,7 @@
whitelist_externals
=
make
usedevelop
=
True
deps
=
pip
=
=18.0 # tmp: https://github.com/pypa/pipenv/issues/2924
coverage
fluidpythran
mako
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment