VERSIONTAG=$(rpmversion)-$(rpmtaglevel)
# this used to be 'should-be-redefined-by-specfile' and it indeed should be
SCMURL=git://git.onelab.eu/sfa.git
-TARBALL_HOST=root@build.onelab.eu
-TARBALL_TOPDIR=/build/sfa
-# I have an alternate pypitest entry defined in my .pypirc
-PYPI_TARGET=pypi
python: version
.PHONY: signatures
########## for uploading onto pypi
+# use pypitest instead for tests (both entries need to be defined in your .pypirc)
+PYPI_TARGET=pypi
+PYPI_TARBALL_HOST=root@build.onelab.eu
+PYPI_TARBALL_TOPDIR=/build/sfa
+
# a quick attempt on pypitest did not quite work as expected
# I was hoping to register the project using "setup.py register"
# but somehow most of my meta data did not make it up there
# run this only once the sources are in on the right tag
pypi: index.html
setup.py sdist upload -r $(PYPI_TARGET)
- ssh $(TARBALL_HOST) mkdir -p $(TARBALL_TOPDIR)/$(VERSIONTAG)
- rsync -av dist/sfa-$(VERSIONTAG).tar.gz $(TARBALL_HOST):$(TARBALL_TOPDIR)/$(VERSIONTAG)
+ ssh $(PYPI_TARBALL_HOST) mkdir -p $(PYPI_TARBALL_TOPDIR)/$(VERSIONTAG)
+ rsync -av dist/sfa-$(VERSIONTAG).tar.gz $(PYPI_TARBALL_HOST):$(PYPI_TARBALL_TOPDIR)/$(VERSIONTAG)
# cleanup
clean: readme-clean
except:
long_description = "Unable to read index.html"
- setup(name='sfa',
- packages = packages,
- data_files = data_files,
- version=version_tag,
- keywords = ['federation','testbeds','SFA','SfaWrap'],
- url="http://svn.planet-lab.org/wiki/SFATutorial",
- author="Thierry Parmentelat, Tony Mack, Scott Baker",
- author_email="thierry.parmentelat@inria.fr, tmack@princeton.cs.edu, smbaker@gmail.com",
- download_url = "http://build.onelab.eu/sfa/{v}/sfa-{v}.tar.gz".format(v=version_tag),
- description="SFA Wrapper with drivers for PlanetLab and IotLab and others",
- license = license,
- long_description = long_description,
- scripts = scripts,
+ setup(
+ name = 'sfa',
+ packages = packages,
+ data_files = data_files,
+ version = version_tag,
+ keywords = ['federation','testbeds','SFA','SfaWrap'],
+ url = "http://svn.planet-lab.org/wiki/SFATutorial",
+ author = "Thierry Parmentelat, Tony Mack, Scott Baker",
+ author_email = "thierry.parmentelat@inria.fr, tmack@princeton.cs.edu, smbaker@gmail.com",
+ download_url = "http://build.onelab.eu/sfa/{v}/sfa-{v}.tar.gz".format(v=version_tag),
+ description = "SFA Wrapper with drivers for PlanetLab and IotLab and others",
+ license = license,
+ long_description = long_description,
+ scripts = scripts,
)
%define name sfa
%define version 3.1
-%define taglevel 13
+%define taglevel 14
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
%global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
#[ "$1" -ge "1" ] && service sfa-cm restart || :
%changelog
+* Thu Apr 09 2015 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sfa-3.1-14
+- for SSL & python-2.7.9: ignore server verification
+- assume 2.7: remove compat code - always use HTTPSConnection (not HTTPS anymore)
+- fix: Reset GIDs works even if user has no pub_key
+- tweak for ubuntu (that does not have systemctl)
+- iotlab driver: fix ldap account creation at each lease
+- miscell cosmetic & layout
+
* Mon Dec 01 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sfa-3.1-13
- bugfix - was adding extraneous backslashes in email address when attempting to AddPerson