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
ariaec
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
28
Issues
28
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
bis-aria
ariaec
Commits
bf6fec2d
Commit
bf6fec2d
authored
Jan 20, 2016
by
fabrice
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Version number following git tag system
parent
850c70a9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
5 deletions
+27
-5
ariaec/maplot.py
ariaec/maplot.py
+7
-2
setup.py
setup.py
+20
-3
No files found.
ariaec/maplot.py
View file @
bf6fec2d
...
...
@@ -35,8 +35,13 @@ class AriaEcContactMap(object):
logger
.
debug
(
"Args:
\n
"
+
json
.
dumps
(
self
.
settings
.
contactmap
.
args
,
indent
=
4
))
# ----------------------------- Input -------------------------------- #
self
.
outprefix
=
get_filename
(
self
.
settings
.
contactmap
.
args
.
get
(
"seq"
,
None
))
+
self
.
settings
.
contactmap
.
args
.
get
(
"prefix"
,
""
)
if
self
.
settings
.
contactmap
.
args
.
get
(
"prefix"
):
self
.
outprefix
=
"_"
.
join
((
get_filename
(
self
.
settings
.
contactmap
.
args
.
get
(
"seq"
,
None
)),
self
.
settings
.
contactmap
.
args
.
get
(
"prefix"
,
""
)))
else
:
self
.
outprefix
=
get_filename
(
self
.
settings
.
contactmap
.
args
.
get
(
"seq"
,
None
))
# Load Sequence file
self
.
protein
.
set_aa_sequence
(
self
.
settings
.
contactmap
.
args
.
get
(
"seq"
,
None
))
# Load secondary structure prediction file
...
...
setup.py
View file @
bf6fec2d
import
os
import
subprocess
from
setuptools
import
setup
,
find_packages
,
Command
__version_info__
=
(
0
,
0
,
0
)
# MAJOR, MINOR, PATCH
# Fetch version from git tags, and write to version.py.
# Also, when git is not available (PyPi package), use stored version.py.
version_py
=
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
'version.py'
)
try
:
version_git
=
subprocess
.
check_output
([
"git"
,
"describe"
,
"--tags"
]).
rstrip
()
except
subprocess
.
CalledProcessError
:
with
open
(
version_py
,
'r'
)
as
fh
:
version_git
=
open
(
version_py
).
read
().
strip
().
split
(
'='
)[
-
1
].
replace
(
'"'
,
''
)
version_msg
=
"# Do not edit this file, pipeline versioning is governed by git tags"
with
open
(
version_py
,
'w'
)
as
pyv
:
pyv
.
write
(
version_msg
+
os
.
linesep
+
"__version__="
+
version_git
)
__version_info__
=
(
0
,
1
,
0
)
# MAJOR, MINOR, PATCH
__version__
=
'.'
.
join
((
str
(
i
)
for
i
in
__version_info__
))
...
...
@@ -15,7 +31,8 @@ class CleanCommand(Command):
def
finalize_options
(
self
):
pass
def
run
(
self
):
@
staticmethod
def
run
():
os
.
system
(
'rm -vrf ./build ./dist ./*.pyc ./*.tgz ./*.egg '
'./*.egg-info'
)
...
...
@@ -28,7 +45,7 @@ with open('README.rst') as f:
setup
(
name
=
"ariaec"
,
version
=
__version__
,
version
=
"{ver}"
.
format
(
ver
=
version_git
)
,
packages
=
find_packages
(),
scripts
=
[
'bin/ec2aria.py'
],
...
...
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