Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
NIFTy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
13
Issues
13
List
Boards
Labels
Service Desk
Milestones
Merge Requests
15
Merge Requests
15
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ift
NIFTy
Commits
650634af
Commit
650634af
authored
Mar 07, 2018
by
Martin Reinecke
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'NIFTy_4' into improve_minimization
parents
71eabd61
d516b4cd
Pipeline
#25831
passed with stage
in 12 minutes and 24 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
4 deletions
+27
-4
.gitignore
.gitignore
+4
-1
docs/source/conf.py
docs/source/conf.py
+2
-2
nifty4/version.py
nifty4/version.py
+10
-1
setup.py
setup.py
+11
-0
No files found.
.gitignore
View file @
650634af
# custom
# never store the git version file
git_version.py
# custom
setup.cfg
.idea
.DS_Store
...
...
docs/source/conf.py
View file @
650634af
...
...
@@ -82,9 +82,9 @@ author = u'Theo Steininger / Martin Reinecke'
# built documents.
#
# The short X.Y version.
version
=
u
'
3.9
'
version
=
u
'
4.0
'
# The full version, including alpha/beta/rc tags.
release
=
u
'
3.9
.0'
release
=
u
'
4.0
.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
...
...
nifty4/version.py
View file @
650634af
...
...
@@ -2,4 +2,13 @@
# 1) we don't load dependencies by storing it in __init__.py
# 2) we can import it in setup.py for the same reason
# 3) we can import it into your module module
__version__
=
'3.9.0'
__version__
=
'4.0.0'
def
gitversion
():
try
:
from
.git_version
import
gitversion
except
ImportError
:
return
"unknown"
return
gitversion
setup.py
View file @
650634af
...
...
@@ -18,6 +18,17 @@
from
setuptools
import
setup
,
find_packages
def
write_version
():
import
subprocess
p
=
subprocess
.
Popen
([
"git"
,
"describe"
,
"--dirty"
,
"--tags"
],
stdout
=
subprocess
.
PIPE
)
res
=
p
.
communicate
()[
0
].
strip
().
decode
(
'utf-8'
)
with
open
(
"nifty4/git_version.py"
,
"w"
)
as
file
:
file
.
write
(
'gitversion = "{}"
\n
'
.
format
(
res
))
write_version
()
exec
(
open
(
'nifty4/version.py'
).
read
())
setup
(
name
=
"nifty4"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment