Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
File Transfer Service
fts-rest
Commits
ce0f2f11
Commit
ce0f2f11
authored
Feb 10, 2017
by
Alejandro Alvarez Ayllon
Browse files
FTS-881
: Add __version__ to fts3
parent
4a15883a
Pipeline
#80740
passed with stage
in 44 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
packaging/Makefile
View file @
ce0f2f11
NAME
=
fts-rest
SPEC
=
rpm/
$(NAME)
.spec
VERSION
=
${
shell
grep
'^Version:'
$(SPEC)
|
awk
'{print $$2
}
'
}
VERSION
=
${
shell
grep
-m1
'^Version:'
$(SPEC)
|
awk
'{print $$2
}
'
}
# Leave blank. To be overriden by CI tools.
RELEASE
=
...
...
packaging/rpm/fts-rest.spec
View file @
ce0f2f11
...
...
@@ -4,19 +4,19 @@
%{!?nosetest_path: %global nosetest_path "/tmp"}
Name: fts-rest
Version: 3.6.
1
Version: 3.6.
2
Release: 1%{?dist}
BuildArch: noarch
Summary: FTS3 Rest Interface
Group: Applications/Internet
License: ASL 2.0
URL: http://fts3-service.web.cern.ch/
# git clone https://gitlab.cern.ch/fts/fts-rest.git --depth 1 -b master fts-rest-3.6.
1
# cd fts-rest-3.6.
1
# git checkout v3.6.
1
# git clone https://gitlab.cern.ch/fts/fts-rest.git --depth 1 -b master fts-rest-3.6.
2
# cd fts-rest-3.6.
2
# git checkout v3.6.
2
# git submodule init && git submodule update
# cd ..
# tar vczf fts-rest-3.6.
1
.tar.gz --exclude-vcs fts-rest-3.6.
1
# tar vczf fts-rest-3.6.
2
.tar.gz --exclude-vcs fts-rest-3.6.
2
Source0: %{name}-%{version}.tar.gz
BuildRequires: gfal2-python
...
...
@@ -190,6 +190,17 @@ mkdir -p %{buildroot}/%{_var}/log/fts3rest/
cp --preserve=timestamps -r src/fts3 %{buildroot}/%{python_sitelib}
cat > %{buildroot}/%{python_sitelib}/fts3.egg-info <<EOF
Metadata-Version: 1.0
Name: fts3
Version: %{version}
Summary: FTS3 Python Libraries.
Home-page: http://fts3-service.web.cern.ch
Author: FTS Developers
Author-email: fts-devel@cern.ch
License: Apache2
EOF
%files
%dir %{python_sitelib}/fts3rest/
...
...
@@ -280,6 +291,7 @@ cp --preserve=timestamps -r src/fts3 %{buildroot}/%{python_sitelib}
%files -n python-fts
%{python_sitelib}/fts3
%{python_sitelib}/fts3.egg-info
%doc LICENSE
%changelog
...
...
setup.py
View file @
ce0f2f11
...
...
@@ -52,8 +52,8 @@ if dist[0] in ('redhat', 'centos'):
base_dir
=
os
.
path
.
dirname
(
__file__
)
setup
(
name
=
'fts3
-rest
'
,
version
=
'3.6.
0
'
,
name
=
'fts3'
,
version
=
'3.6.
2
'
,
description
=
'FTS3 Python Libraries'
,
author
=
'FTS3 Developers'
,
author_email
=
'fts-devel@cern.ch'
,
...
...
src/fts3/__init__.py
View file @
ce0f2f11
import
pkg_resources
try
:
__version__
=
pkg_resources
.
get_distribution
(
"fts3"
).
version
except
pkg_resources
.
DistributionNotFound
:
__version__
=
'3.x.x'
src/fts3rest/fts3rest/controllers/api.py
View file @
ce0f2f11
...
...
@@ -28,7 +28,7 @@ from fts3rest.lib.base import BaseController, Session
from
fts3rest.lib.helpers
import
jsonify
from
fts3rest.lib
import
api
API_VERSION
=
dict
(
major
=
3
,
minor
=
6
,
patch
=
1
)
API_VERSION
=
dict
(
major
=
3
,
minor
=
6
,
patch
=
2
)
def
_get_fts_core_version
():
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment