Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
lbmpy
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
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
Show more breadcrumbs
Markus Holzer
lbmpy
Commits
eb191dc1
Commit
eb191dc1
authored
3 years ago
by
Dominik Thoennes
Browse files
Options
Downloads
Plain Diff
Merge branch 'SmallFixes' into 'master'
Fix setup dependency Closes
#22
See merge request
!96
parents
2bfdfe0f
8b0e1efe
No related branches found
No related tags found
No related merge requests found
Pipeline
#34567
passed
3 years ago
Stage: pretest
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
setup.py
+5
-3
5 additions, 3 deletions
setup.py
with
5 additions
and
3 deletions
setup.py
+
5
−
3
View file @
eb191dc1
import
os
import
os
import
sys
import
io
import
io
from
setuptools
import
setup
,
find_packages
from
setuptools
import
setup
,
find_packages
import
distutils
import
distutils
...
@@ -10,6 +9,7 @@ import versioneer
...
@@ -10,6 +9,7 @@ import versioneer
try
:
try
:
import
cython
# noqa
import
cython
# noqa
USE_CYTHON
=
True
USE_CYTHON
=
True
except
ImportError
:
except
ImportError
:
USE_CYTHON
=
False
USE_CYTHON
=
False
...
@@ -19,6 +19,7 @@ quick_tests = [
...
@@ -19,6 +19,7 @@ quick_tests = [
'
test_serial_scenarios.test_channel_srt
'
,
'
test_serial_scenarios.test_channel_srt
'
,
]
]
class
SimpleTestRunner
(
distutils
.
cmd
.
Command
):
class
SimpleTestRunner
(
distutils
.
cmd
.
Command
):
"""
A custom command to run selected tests
"""
"""
A custom command to run selected tests
"""
...
@@ -69,8 +70,9 @@ def cython_extensions(*extensions):
...
@@ -69,8 +70,9 @@ def cython_extensions(*extensions):
else
:
else
:
return
None
return
None
def
get_cmdclass
():
def
get_cmdclass
():
cmdclass
=
{
"
quicktest
"
:
SimpleTestRunner
}
cmdclass
=
{
"
quicktest
"
:
SimpleTestRunner
}
cmdclass
.
update
(
versioneer
.
get_cmdclass
())
cmdclass
.
update
(
versioneer
.
get_cmdclass
())
return
cmdclass
return
cmdclass
...
@@ -85,7 +87,7 @@ setup(name='lbmpy',
...
@@ -85,7 +87,7 @@ setup(name='lbmpy',
author_email
=
'
cs10-codegen@fau.de
'
,
author_email
=
'
cs10-codegen@fau.de
'
,
url
=
'
https://i10git.cs.fau.de/pycodegen/lbmpy/
'
,
url
=
'
https://i10git.cs.fau.de/pycodegen/lbmpy/
'
,
packages
=
[
'
lbmpy
'
]
+
[
'
lbmpy.
'
+
s
for
s
in
find_packages
(
'
lbmpy
'
)],
packages
=
[
'
lbmpy
'
]
+
[
'
lbmpy.
'
+
s
for
s
in
find_packages
(
'
lbmpy
'
)],
install_requires
=
[
'
pystencils
'
,
'
sympy>=1.2
'
,
'
numpy>=1.11.0
'
],
install_requires
=
[
'
pystencils
>=0.4.0
'
,
'
sympy>=1.2
'
,
'
numpy>=1.11.0
'
],
package_data
=
{
'
lbmpy
'
:
[
'
phasefield/simplex_projection.pyx
'
,
package_data
=
{
'
lbmpy
'
:
[
'
phasefield/simplex_projection.pyx
'
,
'
phasefield/simplex_projection.c
'
]},
'
phasefield/simplex_projection.c
'
]},
ext_modules
=
cython_extensions
(
"
lbmpy.phasefield.simplex_projection
"
),
ext_modules
=
cython_extensions
(
"
lbmpy.phasefield.simplex_projection
"
),
...
...
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