Merge "Fix issues with installing sdist and wheels"

diff --git a/anteater/src/patch_scan.py b/anteater/src/patch_scan.py
index 0a32f3e..1deb68f 100644 (file)
--- a/anteater/src/patch_scan.py
+++ b/anteater/src/patch_scan.py
@@ -147,9 +147,9 @@ def licence_check(project, licence_ext,
         # Note: Hardcoded use of 'copyright' & 'spdx' is the result
         # of a decision made at 2017 plugfest to limit searches to
         # just these two strings.
-        if re.search("copyright", content, re.IGNORECASE):
-            logger.info('Contains needed Licence string: %s', patch_file)
-        elif re.search("spdx", content, re.IGNORECASE):
+        patterns = ['copyright', 'spdx',
+                    'http://creativecommons.org/licenses/by/4.0']
+        if any(i in content.lower() for i in patterns):
             logger.info('Contains needed Licence string: %s', patch_file)
         else:
             logger.error('Licence header missing in file: %s', patch_file)

diff --git a/anteater/src/project_scan.py b/anteater/src/project_scan.py
index f33ccca..5ac8b10 100644 (file)
--- a/anteater/src/project_scan.py
+++ b/anteater/src/project_scan.py
@@ -159,9 +159,9 @@ def licence_check(licence_ext, licence_ignore, project, project_dir):
                     # Note: Hardcoded use of 'copyright' & 'spdx' is the result
                     # of a decision made at 2017 plugfest to limit searches to
                     # just these two strings.
-                    if re.search("copyright", content, re.IGNORECASE):
-                        logger.info('Licence string present: %s', full_path)
-                    elif re.search("spdx", content, re.IGNORECASE):
+                    patterns = ['copyright', 'spdx',
+                                'http://creativecommons.org/licenses/by/4.0']
+                    if any(i in content.lower() for i in patterns):
                         logger.info('Licence string present: %s', full_path)
                     else:
                         logger.error('Licence header missing: %s', full_path)

diff --git a/exceptions/armband.yaml b/exceptions/armband.yaml
index d96888c..5881d4a 100644 (file)
--- a/exceptions/armband.yaml
+++ b/exceptions/armband.yaml
@@ -17,4 +17,4 @@ file_audits:
     - wget.+build\.opnfv\.org
     - wget.+artifacts\.opnfv\.org
     - wget.+git\.openstack.org
-    - git clone.+https:\/\/git.opendaylight\.org\/gerrit\/
\ No newline at end of file
+    - git clone.+https:\/\/git.opendaylight\.org\/gerrit\/

diff --git a/exceptions/bamboo.yaml b/exceptions/bamboo.yaml
index 012a658..5881d4a 100644 (file)
--- a/exceptions/bamboo.yaml
+++ b/exceptions/bamboo.yaml
@@ -18,4 +18,3 @@ file_audits:
     - wget.+artifacts\.opnfv\.org
     - wget.+git\.openstack.org
     - git clone.+https:\/\/git.opendaylight\.org\/gerrit\/
-

diff --git a/exceptions/barometer.yaml b/exceptions/barometer.yaml
index 012a658..5881d4a 100644 (file)
--- a/exceptions/barometer.yaml
+++ b/exceptions/barometer.yaml
@@ -18,4 +18,3 @@ file_audits:
     - wget.+artifacts\.opnfv\.org
     - wget.+git\.openstack.org
     - git clone.+https:\/\/git.opendaylight\.org\/gerrit\/
-

diff --git a/exceptions/bottlenecks.yaml b/exceptions/bottlenecks.yaml
index 012a658..5881d4a 100644 (file)
--- a/exceptions/bottlenecks.yaml
+++ b/exceptions/bottlenecks.yaml
@@ -18,4 +18,3 @@ file_audits:
     - wget.+artifacts\.opnfv\.org
     - wget.+git\.openstack.org
     - git clone.+https:\/\/git.opendaylight\.org\/gerrit\/
-

diff --git a/exceptions/compass4nfv.yaml b/exceptions/compass4nfv.yaml
index a413be1..ab5ac5e 100644 (file)
--- a/exceptions/compass4nfv.yaml
+++ b/exceptions/compass4nfv.yaml
@@ -24,4 +24,4 @@ file_audits:
     - \'password\'\:.password
     - \'password\'\:.\{
     - metadata_secret
-    - compass_user_password
\ No newline at end of file
+    - compass_user_password

diff --git a/exceptions/conductor.yaml b/exceptions/conductor.yaml
index 012a658..5881d4a 100644 (file)
--- a/exceptions/conductor.yaml
+++ b/exceptions/conductor.yaml
@@ -18,4 +18,3 @@ file_audits:
     - wget.+artifacts\.opnfv\.org
     - wget.+git\.openstack.org
     - git clone.+https:\/\/git.opendaylight\.org\/gerrit\/
-

diff --git a/exceptions/cperf.yaml b/exceptions/cperf.yaml
new file mode 100644 (file)
index 0000000..5881d4a
--- /dev/null
+++ b/exceptions/cperf.yaml
@@ -0,0 +1,20 @@
+---
+# When adding projects all `arrays: []` sections must have
+# a value, Use 'nullvalue' if no waivers are available.
+#
+# This file uses standard regular expression syntax,  however be mindful
+# of escaping YAML delimiters too (such as `:`) using double quotes "".
+
+binaries:
+  binary_ignore: [nullvalue]
+
+file_audits:
+  file_names: [nullvalue]
+  file_contents:
+    - ^#
+    - git clone.+\.openstack\.org
+    - git clone.+gerrit\.opnfv\.org
+    - wget.+build\.opnfv\.org
+    - wget.+artifacts\.opnfv\.org
+    - wget.+git\.openstack.org
+    - git clone.+https:\/\/git.opendaylight\.org\/gerrit\/

diff --git a/exceptions/daisy.yaml b/exceptions/daisy.yaml
new file mode 100644 (file)
index 0000000..5881d4a
--- /dev/null
+++ b/exceptions/daisy.yaml
@@ -0,0 +1,20 @@
+---
+# When adding projects all `arrays: []` sections must have
+# a value, Use 'nullvalue' if no waivers are available.
+#
+# This file uses standard regular expression syntax,  however be mindful
+# of escaping YAML delimiters too (such as `:`) using double quotes "".
+
+binaries:
+  binary_ignore: [nullvalue]
+
+file_audits:
+  file_names: [nullvalue]
+  file_contents:
+    - ^#
+    - git clone.+\.openstack\.org
+    - git clone.+gerrit\.opnfv\.org
+    - wget.+build\.opnfv\.org
+    - wget.+artifacts\.opnfv\.org
+    - wget.+git\.openstack.org
+    - git clone.+https:\/\/git.opendaylight\.org\/gerrit\/

diff --git a/exceptions/doctor.yaml b/exceptions/doctor.yaml
new file mode 100644 (file)
index 0000000..5881d4a
--- /dev/null
+++ b/exceptions/doctor.yaml
@@ -0,0 +1,20 @@
+---
+# When adding projects all `arrays: []` sections must have
+# a value, Use 'nullvalue' if no waivers are available.
+#
+# This file uses standard regular expression syntax,  however be mindful
+# of escaping YAML delimiters too (such as `:`) using double quotes "".
+
+binaries:
+  binary_ignore: [nullvalue]
+
+file_audits:
+  file_names: [nullvalue]
+  file_contents:
+    - ^#
+    - git clone.+\.openstack\.org
+    - git clone.+gerrit\.opnfv\.org
+    - wget.+build\.opnfv\.org
+    - wget.+artifacts\.opnfv\.org
+    - wget.+git\.openstack.org
+    - git clone.+https:\/\/git.opendaylight\.org\/gerrit\/

diff --git a/exceptions/dovetail.yaml b/exceptions/dovetail.yaml
new file mode 100644 (file)
index 0000000..5881d4a
--- /dev/null
+++ b/exceptions/dovetail.yaml
@@ -0,0 +1,20 @@
+---
+# When adding projects all `arrays: []` sections must have
+# a value, Use 'nullvalue' if no waivers are available.
+#
+# This file uses standard regular expression syntax,  however be mindful
+# of escaping YAML delimiters too (such as `:`) using double quotes "".
+
+binaries:
+  binary_ignore: [nullvalue]
+
+file_audits:
+  file_names: [nullvalue]
+  file_contents:
+    - ^#
+    - git clone.+\.openstack\.org
+    - git clone.+gerrit\.opnfv\.org
+    - wget.+build\.opnfv\.org
+    - wget.+artifacts\.opnfv\.org
+    - wget.+git\.openstack.org
+    - git clone.+https:\/\/git.opendaylight\.org\/gerrit\/

diff --git a/exceptions/dpacc.yaml b/exceptions/dpacc.yaml
new file mode 100644 (file)
index 0000000..5881d4a
--- /dev/null
+++ b/exceptions/dpacc.yaml
@@ -0,0 +1,20 @@
+---
+# When adding projects all `arrays: []` sections must have
+# a value, Use 'nullvalue' if no waivers are available.
+#
+# This file uses standard regular expression syntax,  however be mindful
+# of escaping YAML delimiters too (such as `:`) using double quotes "".
+
+binaries:
+  binary_ignore: [nullvalue]
+
+file_audits:
+  file_names: [nullvalue]
+  file_contents:
+    - ^#
+    - git clone.+\.openstack\.org
+    - git clone.+gerrit\.opnfv\.org
+    - wget.+build\.opnfv\.org
+    - wget.+artifacts\.opnfv\.org
+    - wget.+git\.openstack.org
+    - git clone.+https:\/\/git.opendaylight\.org\/gerrit\/

diff --git a/exceptions/enfv.yaml b/exceptions/enfv.yaml
new file mode 100644 (file)
index 0000000..5881d4a
--- /dev/null
+++ b/exceptions/enfv.yaml
@@ -0,0 +1,20 @@
+---
+# When adding projects all `arrays: []` sections must have
+# a value, Use 'nullvalue' if no waivers are available.
+#
+# This file uses standard regular expression syntax,  however be mindful
+# of escaping YAML delimiters too (such as `:`) using double quotes "".
+
+binaries:
+  binary_ignore: [nullvalue]
+
+file_audits:
+  file_names: [nullvalue]
+  file_contents:
+    - ^#
+    - git clone.+\.openstack\.org
+    - git clone.+gerrit\.opnfv\.org
+    - wget.+build\.opnfv\.org
+    - wget.+artifacts\.opnfv\.org
+    - wget.+git\.openstack.org
+    - git clone.+https:\/\/git.opendaylight\.org\/gerrit\/

diff --git a/exceptions/escalator.yaml b/exceptions/escalator.yaml
new file mode 100644 (file)
index 0000000..5881d4a
--- /dev/null
+++ b/exceptions/escalator.yaml
@@ -0,0 +1,20 @@
+---
+# When adding projects all `arrays: []` sections must have
+# a value, Use 'nullvalue' if no waivers are available.
+#
+# This file uses standard regular expression syntax,  however be mindful
+# of escaping YAML delimiters too (such as `:`) using double quotes "".
+
+binaries:
+  binary_ignore: [nullvalue]
+
+file_audits:
+  file_names: [nullvalue]
+  file_contents:
+    - ^#
+    - git clone.+\.openstack\.org
+    - git clone.+gerrit\.opnfv\.org
+    - wget.+build\.opnfv\.org
+    - wget.+artifacts\.opnfv\.org
+    - wget.+git\.openstack.org
+    - git clone.+https:\/\/git.opendaylight\.org\/gerrit\/

diff --git a/exceptions/fds.yaml b/exceptions/fds.yaml
new file mode 100644 (file)
index 0000000..5881d4a
--- /dev/null
+++ b/exceptions/fds.yaml
@@ -0,0 +1,20 @@
+---
+# When adding projects all `arrays: []` sections must have
+# a value, Use 'nullvalue' if no waivers are available.
+#
+# This file uses standard regular expression syntax,  however be mindful
+# of escaping YAML delimiters too (such as `:`) using double quotes "".
+
+binaries:
+  binary_ignore: [nullvalue]
+
+file_audits:
+  file_names: [nullvalue]
+  file_contents:
+    - ^#
+    - git clone.+\.openstack\.org
+    - git clone.+gerrit\.opnfv\.org
+    - wget.+build\.opnfv\.org
+    - wget.+artifacts\.opnfv\.org
+    - wget.+git\.openstack.org
+    - git clone.+https:\/\/git.opendaylight\.org\/gerrit\/

diff --git a/exceptions/functest.yaml b/exceptions/functest.yaml
index fd531be..c0d01f1 100644 (file)
--- a/exceptions/functest.yaml
+++ b/exceptions/functest.yaml
@@ -19,4 +19,4 @@ file_audits:
     - git clone.+https:\/\/git.opendaylight\.org\/gerrit\/
     - openssl-dev.libjpeg-turbo-dev.git.wget.&
     - RUN.+curl.*https\:\/\/get\.rvm\.io.*bash.*stable
-    - grep.sed.wget.ca-certificates.git.\&&
\ No newline at end of file
+    - grep.sed.wget.ca-certificates.git.\&&

diff --git a/exceptions/octopus.yaml b/exceptions/octopus.yaml
index dde146d..66dd0bb 100644 (file)
--- a/exceptions/octopus.yaml
+++ b/exceptions/octopus.yaml
@@ -6,7 +6,8 @@
 # of escaping YAML delimiters too (such as `:`) using double quotes "".
 
 binaries:
-  binary_ignore: [nullvalue]
+  dynamic-flow.png:
+    - d0d7dfc73e0fac09d920ebbdf8cd4e0ef623f15d6246ff20d7a6d12c9a48bf41
 file_audits:
   file_names: [nullvalue]
   file_contents:

diff --git a/exceptions/pharos.yaml b/exceptions/pharos.yaml
index 2558c03..dde146d 100644 (file)
--- a/exceptions/pharos.yaml
+++ b/exceptions/pharos.yaml
@@ -17,4 +17,3 @@ file_audits:
     - wget.+artifacts\.opnfv\.org
     - wget.+git\.openstack.org
     - git clone.+https:\/\/git.opendaylight\.org\/gerrit\/
-

diff --git a/exceptions/template.yaml b/exceptions/template.yaml
new file mode 100644 (file)
index 0000000..5881d4a
--- /dev/null
+++ b/exceptions/template.yaml
@@ -0,0 +1,20 @@
+---
+# When adding projects all `arrays: []` sections must have
+# a value, Use 'nullvalue' if no waivers are available.
+#
+# This file uses standard regular expression syntax,  however be mindful
+# of escaping YAML delimiters too (such as `:`) using double quotes "".
+
+binaries:
+  binary_ignore: [nullvalue]
+
+file_audits:
+  file_names: [nullvalue]
+  file_contents:
+    - ^#
+    - git clone.+\.openstack\.org
+    - git clone.+gerrit\.opnfv\.org
+    - wget.+build\.opnfv\.org
+    - wget.+artifacts\.opnfv\.org
+    - wget.+git\.openstack.org
+    - git clone.+https:\/\/git.opendaylight\.org\/gerrit\/

diff --git a/exceptions/yardstick.yaml b/exceptions/yardstick.yaml
new file mode 100644 (file)
index 0000000..5881d4a
--- /dev/null
+++ b/exceptions/yardstick.yaml
@@ -0,0 +1,20 @@
+---
+# When adding projects all `arrays: []` sections must have
+# a value, Use 'nullvalue' if no waivers are available.
+#
+# This file uses standard regular expression syntax,  however be mindful
+# of escaping YAML delimiters too (such as `:`) using double quotes "".
+
+binaries:
+  binary_ignore: [nullvalue]
+
+file_audits:
+  file_names: [nullvalue]
+  file_contents:
+    - ^#
+    - git clone.+\.openstack\.org
+    - git clone.+gerrit\.opnfv\.org
+    - wget.+build\.opnfv\.org
+    - wget.+artifacts\.opnfv\.org
+    - wget.+git\.openstack.org
+    - git clone.+https:\/\/git.opendaylight\.org\/gerrit\/

diff --git a/master_list.yaml b/master_list.yaml
index 001565a..c40e138 100644 (file)
--- a/master_list.yaml
+++ b/master_list.yaml
@@ -112,8 +112,17 @@ project_exceptions:
   - compass4nfv: exceptions/compass4nfv.yaml
   - conductor: exceptions/conductor.yaml
   - copper: exceptions/copper.yaml
+  - cperf: exceptions/cperf.yaml
+  - daisy: exceptions/daisy.yaml
+  - doctor: exceptions/doctor.yaml
+  - dovetail: exceptions/dovetail.yaml
+  - dpacc: exceptions/dpacc.yaml
+  - enfv: exceptions/enfv.yaml
+  - escalator: exceptions/escalator.yaml
+  - fds: exceptions/fds.yaml
   - functest: exceptions/functest.yaml
   - octopus: exceptions/octopus.yaml
   - pharos: exceptions/pharos.yaml
   - releng: exceptions/releng.yaml
   - sandbox: exceptions/sandbox.yaml
+  - yardstick: exceptions/yardstick.yaml

diff --git a/requirements.txt b/requirements.txt
index 7a52654..201b07f 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,8 +2,10 @@ appdirs==1.4.3
 binaryornot==0.4.3
 chardet==3.0.2
 docopt==0.6.2
+invoke==0.18.0
 packaging==16.8
 pyaml==16.12.2
 pyparsing==2.2.0
 PyYAML==3.12
 six==1.10.0
+twine==1.9.1

diff --git a/tasks.py b/tasks.py
index 55ac340..30bef4c 100644 (file)
--- a/tasks.py
+++ b/tasks.py
@@ -11,47 +11,64 @@ build_dir = os.path.join(docs_dir, '_build')
 
 
 @task
-def test():
+def test(ctx):
     run('python setup.py test', pty=True)
 
 
 @task
-def clean():
-    run("rm -rf build")
-    run("rm -rf dist")
-    run("rm -rf anteater.egg-info")
-    clean_docs()
+def clean(ctx):
+    ctx.run("rm -rf build")
+    ctx.run("rm -rf dist")
+    ctx.run("rm -rf anteater.egg-info")
+    clean_docs(ctx)
     print("Cleaned up.")
 
 
 @task
-def clean_docs():
-    run("rm -rf %s" % build_dir)
+def clean_docs(ctx):
+    ctx.run("rm -rf %s" % build_dir)
 
 
 @task
-def browse_docs():
-    run("open %s" % os.path.join(build_dir, 'index.html'))
+def browse_docs(ctx):
+    ctx.run("open %s" % os.path.join(build_dir, 'index.html'))
 
 
 @task
-def build_docs(clean=False, browse=False):
+def build_docs(ctx, clean=False, browse=False):
     if clean:
         clean_docs()
-    run("sphinx-build %s %s" % (docs_dir, build_dir), pty=True)
+    ctx.run("sphinx-build %s %s" % (docs_dir, build_dir), pty=True)
     if browse:
         browse_docs()
 
 
 @task
-def readme(browse=False):
-    run('rst2html.py README.rst > README.html')
+def readme(ctx, browse=False):
+    ctx.run('rst2html.py README.rst > README.html')
 
 
 @task
-def publish(test=False):
-    """Publish to the cheeseshop."""
+def build(ctx):
+    """Build source distribution and wheels."""
+    ctx.run('python setup.py sdist bdist_wheel')
+
+
+@task
+def publish(ctx, test=False):
+    """Publish to the cheeseshop.
+
+    This command follows the Python packaging guidelines:
+    https://packaging.python.org/tutorials/distributing-packages
+
+    Information on configuration required for '--test' can be found
+    here: https://wiki.python.org/moin/TestPyPI
+
+    Before uploading please ensure you've signed the release using:
+
+      gpg --detach-sign -a dist/package-1.0.1.tar.gz
+    """
     if test:
-        run('python setup.py register -r test sdist upload -r test')
+        ctx.run('twine upload -r test dist/*')
     else:
-        run("python setup.py register sdist upload")
+        ctx.run("twine upload dist/*")