Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dumux
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dumux-repositories
dumux
Commits
2d7b4c3d
Commit
2d7b4c3d
authored
4 years ago
by
Samuel Burbulla
Committed by
Timo Koch
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Generate pyproject.toml when calling setup.py sdist.
parent
33bc8bc5
No related branches found
No related tags found
1 merge request
!2419
[python] Make DuMux installable via pip
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitignore
+1
-0
1 addition, 0 deletions
.gitignore
pyproject.toml
+1
-1
1 addition, 1 deletion
pyproject.toml
setup.py
+25
-8
25 additions, 8 deletions
setup.py
with
27 additions
and
9 deletions
.gitignore
+
1
−
0
View file @
2d7b4c3d
...
@@ -48,3 +48,4 @@ __pycache__
...
@@ -48,3 +48,4 @@ __pycache__
MANIFEST
MANIFEST
_skbuild/
_skbuild/
dist
dist
*.egg-info
This diff is collapsed.
Click to expand it.
pyproject.toml
+
1
−
1
View file @
2d7b4c3d
[build-system]
[build-system]
requires
=
[
'setuptools'
,
'wheel'
,
'scikit-build'
,
'cmake'
,
'ninja'
,
'requests'
,
'dune-common
>
=
2.8
.
0
.dev
0
', '
dune-grid
>
=
2.8
.
0
.dev
0
', '
dune-localfunctions
>
=
2.8
.
0
.dev
0
', '
dune-istl
>
=
2.8
.
0
.dev
0
', '
dune-alugrid>
=
2.8
.
0
.dev
0
']
requires
=
[
'setuptools'
,
'wheel'
,
'scikit-build'
,
'cmake'
,
'ninja'
,
'requests'
,
'dune-common
<
=
2.8
.
0
.dev
20201218
', '
dune-grid
<
=
2.8
.
0
.dev
20201218
', '
dune-localfunctions
<
=
2.8
.
0
.dev
20201218
', '
dune-istl
<
=
2.8
.
0
.dev
20201218
']
build-backend
=
'setuptools.build_meta'
build-backend
=
'setuptools.build_meta'
This diff is collapsed.
Click to expand it.
setup.py
+
25
−
8
View file @
2d7b4c3d
try
:
try
:
from
dune.packagemetadata
import
metaData
,
Description
from
dune.packagemetadata
import
metaData
except
ImportError
:
except
ImportError
:
from
packagemetadata
import
metaData
,
Description
from
packagemetadata
import
metaData
from
setuptools
import
find_namespace_packages
from
setuptools
import
find_namespace_packages
from
skbuild
import
setup
from
skbuild
import
setup
description
=
Description
(
'
dune.module
'
)
# When building a new package, update the version numbers below and run:
version
=
description
.
versionstring
.
replace
(
'
-git
'
,
''
)
# > python setup.py sdist
# > python -m twine upload dist/*
build
Version
=
'
.0.dev20201
212
'
dumux
Version
=
'
3.4
.0.dev202
1
01
14
'
duneVersion
=
'
2.8
'
+
buildVersion
duneVersion
=
'
2.8
.0.dev20201218
'
metadata
=
metaData
(
duneVersion
)[
1
]
metadata
=
metaData
(
duneVersion
)[
1
]
metadata
[
'
version
'
]
=
version
+
buildVersion
metadata
[
'
version
'
]
=
dumuxVersion
metadata
[
'
long_description
'
]
=
metadata
[
'
long_description
'
].
replace
(
'
doc/logo/dumux_logo_hires_whitebg.png
'
,
'
https://dumux.org/images/logo.svg
'
)
metadata
[
'
long_description
'
]
=
metadata
[
'
long_description
'
].
replace
(
'
doc/logo/dumux_logo_hires_whitebg.png
'
,
'
https://dumux.org/images/logo.svg
'
)
metadata
[
'
packages
'
]
=
find_namespace_packages
(
where
=
'
python
'
,
include
=
[
'
dumux.*
'
])
metadata
[
'
packages
'
]
=
find_namespace_packages
(
where
=
'
python
'
,
include
=
[
'
dumux.*
'
])
# auto-generate pyproject.toml with duneVersion when building sdist
from
skbuild.command.sdist
import
sdist
class
mysdist
(
sdist
):
def
run
(
self
):
requires
=
[
'
setuptools
'
,
'
wheel
'
,
'
scikit-build
'
,
'
cmake
'
,
'
ninja
'
,
'
requests
'
]
requires
+=
metadata
[
'
install_requires
'
]
with
open
(
'
pyproject.toml
'
,
'
w
'
)
as
f
:
f
.
write
(
"
[build-system]
\n
"
)
f
.
write
(
"
requires = [
'"
+
"'
,
'"
.
join
(
requires
)
+
"'
]
\n
"
)
f
.
write
(
"
build-backend =
'
setuptools.build_meta
'
\n
"
)
sdist
.
run
(
self
)
metadata
[
'
cmdclass
'
]
=
{
'
sdist
'
:
mysdist
}
setup
(
**
metadata
)
setup
(
**
metadata
)
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