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
753ff6ad
Commit
753ff6ad
authored
Oct 16, 2018
by
Andrea Manzi
Browse files
Merge branch 'develop'
parents
6b295fa9
289d7cac
Pipeline
#544802
failed with stage
in 45 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
packaging/rpm/fts-rest.spec
View file @
753ff6ad
...
...
@@ -4,19 +4,19 @@
%{!?nosetest_path: %global nosetest_path "/tmp"}
Name: fts-rest
Version: 3.8.
0
Version: 3.8.
1
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.8.
0
# cd fts-rest-3.8.
0
# git checkout v3.8.
0
# git clone https://gitlab.cern.ch/fts/fts-rest.git --depth 1 -b master fts-rest-3.8.
1
# cd fts-rest-3.8.
1
# git checkout v3.8.
1
# git submodule init && git submodule update
# cd ..
# tar vczf fts-rest-3.8.
0
.tar.gz --exclude-vcs fts-rest-3.8.
0
# tar vczf fts-rest-3.8.
1
.tar.gz --exclude-vcs fts-rest-3.8.
1
Source0: %{name}-%{version}.tar.gz
BuildRequires: gfal2-python
...
...
setup.py
View file @
753ff6ad
...
...
@@ -40,12 +40,22 @@ def apply_pycurl_workaround():
os
.
system
(
'pip install --build %s %s/pycurl'
%
(
tmp_dir
,
tmp_dir
))
# On EL7, you will probably have trouble installing pycurl due to this:
# https://github.com/pycurl/pycurl/issues/526 which has not yet released
# so we need to install a previos version of pycurl with
# pip install pycurl==7.43.0.1 --global-option="--with-nss
#def apply_pycurl_workaround_on_el7():
# print "Applying workaround for pycurl in EL7"
# is_pycurl_installed = (os.system('pip list | grep pycurl &> /dev/null') == 0)
# if not is_pycurl_installed:
# os.system('pip install pycurl%s --global-option="--with-nss"' % pycurl_ver)
# Ugly hack to pick a version that compiles in SLC6
pycurl_ver
=
'
>
=7.19'
pycurl_ver
=
'
=
=7.19
.0
'
dist
=
platform
.
dist
()
if
dist
[
0
]
in
(
'redhat'
,
'centos'
):
apply_m2crypto_workaround
()
os_major
=
dist
[
1
].
split
(
'.'
)[
0
]
if
os_major
==
'6'
:
pycurl_ver
=
'==7.19.0'
...
...
@@ -57,7 +67,7 @@ base_dir = os.path.dirname(__file__)
setup
(
name
=
'fts3-rest'
,
version
=
'3.8.
0
'
,
version
=
'3.8.
1
'
,
description
=
'FTS3 Python Libraries'
,
long_description
=
'FTS3 Python Libraries'
,
author
=
'FTS3 Developers'
,
...
...
src/fts3rest/fts3rest/controllers/api.py
View file @
753ff6ad
...
...
@@ -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
=
8
,
patch
=
0
)
API_VERSION
=
dict
(
major
=
3
,
minor
=
8
,
patch
=
1
)
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