hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make flake8 happy with .../jdk/package.py

Browse source 
My PR for adding a new jdk version failed its
travis run because of existing flake8 violoations.

This package cleans them up.

I'm not particularly pythonic, but most of the complaints were
obvious.  HOWEVER, I'm not particularly confident about handling
long lines by taking an flake8 exception comment onto the end.

Feedback welcome...
This commit is contained in:
George Hartzell 2016-07-15 12:39:40 -04:00
parent a73d91a2e5
commit 64b1bafd41
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
var/spack/repos/builtin/packages/jdk/package.py
View file

@ -22,21 +22,20 @@
# License along with this program; if not, write to the Free Software # License along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
#------------------------------------------------------------------------------ #
# Author: Justin Too <too1@llnl.gov> # Author: Justin Too <too1@llnl.gov>
#------------------------------------------------------------------------------ #
import distutils import distutils
from distutils import dir_util
from subprocess import call
import spack import spack
from spack import * from spack import *
import llnl.util.tty as tty import llnl.util.tty as tty
class Jdk(Package): class Jdk(Package):
"""The Java Development Kit (JDK) released by Oracle Corporation """The Java Development Kit (JDK) released by Oracle Corporation
in the form of a binary product aimed at Java developers.""" in the form of a binary product aimed at Java developers."""
homepage = "http://www.oracle.com/technetwork/java/javase/downloads/index.html" homepage = "http://www.oracle.com/technetwork/java/javase/downloads/index.html" # noqa: E501
version('8u66-linux-x64', '88f31f3d642c3287134297b8c10e61bf', version('8u66-linux-x64', '88f31f3d642c3287134297b8c10e61bf',
url="http://download.oracle.com/otn-pub/java/jdk/8u66-b17/jdk-8u66-linux-x64.tar.gz") url="http://download.oracle.com/otn-pub/java/jdk/8u66-b17/jdk-8u66-linux-x64.tar.gz")
@ -48,10 +47,10 @@ class Jdk(Package):
# automate this process, we need to utilize these additional curl # automate this process, we need to utilize these additional curl
# commandline options. # commandline options.
# #
# See http://stackoverflow.com/questions/10268583/how-to-automate-download-and-installation-of-java-jdk-on-linux # See http://stackoverflow.com/questions/10268583/how-to-automate-download-and-installation-of-java-jdk-on-linux # noqa: E501
curl_options=[ curl_options = [
'-j', # junk cookies '-j', # junk cookies
'-H', # specify required License Agreement cookie '-H', # specify required License Agreement cookie
'Cookie: oraclelicense=accept-securebackup-cookie'] 'Cookie: oraclelicense=accept-securebackup-cookie']
def do_fetch(self, mirror_only=False): def do_fetch(self, mirror_only=False):
@ -67,6 +66,5 @@ def do_fetch(self, mirror_only=False):
# Now perform the actual fetch # Now perform the actual fetch
super(Jdk, self).do_fetch(mirror_only) super(Jdk, self).do_fetch(mirror_only)
def install(self, spec, prefix): def install(self, spec, prefix):
distutils.dir_util.copy_tree(".", prefix) distutils.dir_util.copy_tree(".", prefix)