Merge pull request #70 from aeternity/release/0.24.0.2

noandrea · web-flow · commit bce24f0c1db4 · 2018-11-01T17:59:44.000+01:00
Release/0.24.0.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ log follows the conventions of [keepachangelog.com](http://keepachangelog.com/).
 
 ## [Unreleased]
 
+## [0.24.0.2]
+
+### Fixed
+
+- Fix for [CVE-2018-18074](https://nvd.nist.gov/vuln/detail/CVE-2018-18074)
+
 ## [0.24.0.1]
 
 ### Removed
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,29 +4,35 @@ pipeline {
       filename 'Dockerfile.ci'
       args '-v /etc/group:/etc/group:ro ' +
            '-v /etc/passwd:/etc/passwd:ro ' +
-           '-v /var/lib/jenkins:/var/lib/jenkins ' +
+           '-v /home/jenkins:/home/jenkins ' +
            '-v /usr/bin/docker:/usr/bin/docker:ro ' +
            '--network=host'
     }
   }
 
   environment {
     DOCKER_COMPOSE = "docker-compose -p ${env.BUILD_TAG} -H 127.0.0.1:2376"
+    SCANNER_HOME = tool 'default-sonarqube-scanner'
   }
 
   stages {
-
     stage('Test') {
-      steps {
+      steps {          
           withCredentials([usernamePassword(credentialsId: 'genesis-wallet',
                                           usernameVariable: 'WALLET_PUB',
                                           passwordVariable: 'WALLET_PRIV')]) {
           sh "${env.DOCKER_COMPOSE} run sdk flake8"
-          sh "${env.DOCKER_COMPOSE} run sdk pytest --junitxml test-results.xml aeternity/tests"
+          sh "${env.DOCKER_COMPOSE} run sdk make test"
+          // run sonar?
+          // withSonarQubeEnv('default-sonarqube-server') {
+          //   sh "${env.SCANNER_HOME}/bin/sonar-scanner -X"
+          // }
         }
       }
     }
 
+
+
     stage('Publish') {
       when {
         buildingTag()
diff --git a/Makefile b/Makefile
@@ -20,7 +20,7 @@ test: test-all
 
 test-all:
 	@echo run pytest
-	pytest
+	pytest --junitxml test-results.xml tests --cov=aeternity --cov-config .coveragerc --cov-report xml:coverage.xml
 	@echo done
 
 lint: lint-all
diff --git a/aeternity/__init__.py b/aeternity/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '0.24.0.1'
+__version__ = '0.24.0.2'
 
 __compatibility__ = [
     '0.24.0'
diff --git a/requirements.txt b/requirements.txt
@@ -1,12 +1,13 @@
 pytest==3.5.0
+pytest-cov==2.6.0
 base58==0.2.5
 click==6.7
 cryptography==2.3
 deprecation==2.0.5
 flake8==3.5.0
 rlp==0.6.0
 PyNaCl==1.2.1
-requests==2.18.4
+requests==2.20.0
 websocket_client==0.48.0
 validators==0.12.1
 eth-keyfile==0.5.1
diff --git a/setup.py b/setup.py
@@ -47,7 +47,7 @@ def get_version():
         'cryptography == 2.3',
         'rlp == 0.6.0',
         'PyNaCl == 1.2.1',
-        'requests == 2.18.4',
+        'requests == 2.20.0',
         'websocket_client == 0.48.0',
         'validators == 0.12.1',
         'eth-keyfile == 0.5.1'
@@ -56,7 +56,7 @@ def get_version():
         'Programming Language :: Python',
         'Programming Language :: Python :: 3.5',
         'Development Status :: 4 - Beta',
-        'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
+        'License :: OSI Approved :: ISC License (ISCL)',
         'Intended Audience :: Developers',
         'Operating System :: OS Independent',
     ],
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -0,0 +1,14 @@
+sonar.projectKey=aeternity:aepp-sdk-python
+sonar.projectName=Python :: Aeternity SDK 
+sonar.projectVersion=0.24.0.1
+
+sonar.sources=aeternity
+sonar.tests=tests
+sonar.language=py
+
+sonar.python.xunit.reportPath=test-results.xml
+sonar.python.coverage.reportPath=coverage.xml
+
+sonar.links.scm=https://github.com/aeternity/aepp-sdk-python.git
+sonar.links.scm_dev=git@github.com:aeternity/aepp-sdk-python.git
+#sonar.python.pylint=/usr/local/bin/pylint - the path to the pylin, if you want to include some quality rules from it
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/test_aens.py b/tests/test_aens.py
@@ -1,5 +1,5 @@
 from aeternity.aens import AEName
-from aeternity.tests import EPOCH_CLI, ACCOUNT, random_domain
+from tests import EPOCH_CLI, ACCOUNT, random_domain
 
 from pytest import raises
 
diff --git a/tests/test_api.py b/tests/test_api.py
@@ -1,4 +1,4 @@
-from aeternity.tests import PUBLIC_KEY, EPOCH_VERSION, ACCOUNT, EPOCH_CLI
+from tests import PUBLIC_KEY, EPOCH_VERSION, ACCOUNT, EPOCH_CLI
 from aeternity.signing import Account
 from aeternity import openapi
 
diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -4,15 +4,15 @@
 import os
 import aeternity
 import random
-from aeternity.tests import NODE_URL, NODE_URL_DEBUG, ACCOUNT, EPOCH_CLI, tempdir, random_domain
+from tests import NODE_URL, NODE_URL_DEBUG, ACCOUNT, EPOCH_CLI, tempdir, random_domain
 from aeternity.signing import Account
 from aeternity import utils
 from aeternity.aens import AEName
 
 import pytest
 
 current_folder = os.path.dirname(os.path.abspath(__file__))
-aecli_exe = os.path.join(current_folder, '..', '..', 'aecli')
+aecli_exe = os.path.join(current_folder, '..', 'aecli')
 
 
 @pytest.fixture
diff --git a/tests/test_contract.py b/tests/test_contract.py
@@ -2,7 +2,7 @@
 from pytest import raises
 
 from aeternity.contract import ContractError, Contract
-from aeternity.tests import ACCOUNT, EPOCH_CLI
+from tests import ACCOUNT, EPOCH_CLI
 from aeternity import hashing, utils
 
 aer_identity_contract = '''
diff --git a/tests/test_epoch.py b/tests/test_epoch.py
@@ -1,4 +1,4 @@
-from aeternity.tests import ACCOUNT, EPOCH_CLI
+from tests import ACCOUNT, EPOCH_CLI
 from aeternity.signing import Account
 
 # from aeternity.exceptions import TransactionNotFoundException
diff --git a/tests/test_hashing.py b/tests/test_hashing.py
diff --git a/tests/test_openapi.py b/tests/test_openapi.py
@@ -1,6 +1,6 @@
 import pytest
 from aeternity.openapi import OpenAPICli
-from aeternity.tests import NODE_URL, NODE_URL_DEBUG, PUBLIC_KEY
+from tests import NODE_URL, NODE_URL_DEBUG, PUBLIC_KEY
 
 client, priv_key, pub_key = None, None, None
 
diff --git a/tests/test_oracle.py b/tests/test_oracle.py
@@ -1,7 +1,7 @@
 import logging
 import pytest
 
-from aeternity.tests import EPOCH_CLI
+from tests import EPOCH_CLI
 from aeternity.oracle import Oracle, OracleQuery
 
 logger = logging.getLogger(__name__)
diff --git a/tests/test_signing.py b/tests/test_signing.py
@@ -1,5 +1,5 @@
 from pytest import raises
-from aeternity.tests import TEST_FEE, TEST_TTL, EPOCH_CLI, ACCOUNT, tempdir
+from tests import TEST_FEE, TEST_TTL, EPOCH_CLI, ACCOUNT, tempdir
 from aeternity.signing import Account
 from aeternity.utils import is_valid_hash
 from aeternity.transactions import TxBuilder
diff --git a/tests/test_transactions.py b/tests/test_transactions.py
@@ -1,4 +1,4 @@
-from aeternity.tests import ACCOUNT, EPOCH_CLI
+from tests import ACCOUNT, EPOCH_CLI
 from aeternity.signing import Account
 from aeternity import transactions
 
diff --git a/tests/test_utils.py b/tests/test_utils.py
diff --git a/tests/testdata/keystore.json b/tests/testdata/keystore.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-__version__ = '0.24.0.1'`
	`1`	`+__version__ = '0.24.0.2'`
`2`	`2`
`3`	`3`	`__compatibility__ = [`
`4`	`4`	`'0.24.0'`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from aeternity.tests import PUBLIC_KEY, EPOCH_VERSION, ACCOUNT, EPOCH_CLI`
	`1`	`+from tests import PUBLIC_KEY, EPOCH_VERSION, ACCOUNT, EPOCH_CLI`
`2`	`2`	`from aeternity.signing import Account`
`3`	`3`	`from aeternity import openapi`
`4`	`4`