Merge pull request #821 from ssurenr/fixbuild

Fix Builds due to process-dependency-links removal

Author: ssurenr

build-tools/Dockerfile.debian.builder

@@ -61,7 +61,7 @@ COPY requirements.docs.txt /tmp/requirements.docs.txt
 
 RUN pip install --no-cache-dir --upgrade pip && \
     pip install --no-cache-dir setuptools flake8 virtualenv && \
-	pip install --no-cache-dir --process-dependency-links -r /tmp/requirements.txt && \
+	pip install --no-cache-dir -r /tmp/requirements.txt && \
 	pip install --no-cache-dir -r /tmp/requirements.docs.txt && \
 	go get github.com/wadey/gocovmerge && \
 	go get golang.org/x/tools/cmd/cover && \

build-tools/Dockerfile.debian.runtime

@@ -13,7 +13,7 @@ COPY requirements.txt /tmp/requirements.txt
 RUN apt-get update && apt-get install -y --no-install-recommends \
         git \
     && pip install --no-cache-dir --upgrade pip \
-    && pip install --no-cache-dir --process-dependency-links -r /tmp/requirements.txt \
+    && pip install --no-cache-dir -r /tmp/requirements.txt \
     && apt-get remove -y git
 
 COPY bigip-virtual-server_v*.json $APPPATH/vendor/src/f5/schemas/

build-tools/Dockerfile.rhel7.builder

@@ -56,7 +56,7 @@ COPY requirements.docs.txt /tmp/requirements.docs.txt
 RUN source scl_source enable python27 && \
 	pip install --no-cache-dir --upgrade pip && \
 	pip install --no-cache-dir setuptools flake8 && \
-	pip install --no-cache-dir --process-dependency-links --ignore-installed -r /tmp/requirements.txt && \
+	pip install --no-cache-dir --ignore-installed -r /tmp/requirements.txt && \
 	pip install --no-cache-dir -r /tmp/requirements.docs.txt && \
 	go get github.com/wadey/gocovmerge && \
 	go get golang.org/x/tools/cmd/cover && \

build-tools/Dockerfile.rhel7.runtime

@@ -30,7 +30,7 @@ RUN microdnf --enablerepo=rhel-7-server-rpms --enablerepo=rhel-7-server-optional
     go-md2man -in /tmp/help.md -out /help.1 && rm -f /tmp/help.md && \
     source scl_source enable python27 && \
     pip install --no-cache-dir --upgrade pip && \
-    pip install --no-cache-dir --process-dependency-links -r /tmp/requirements.txt && \
+    pip install --no-cache-dir -r /tmp/requirements.txt && \
     python -m pip uninstall -y pip && \
     adduser ctlr && \
     microdnf remove golang-github-cpuguy83-go-md2man git fipscheck fipscheck-lib groff-base \

build-tools/attributions-generator.sh

@@ -7,7 +7,7 @@
 set -e
 set -x
 
-ATTR_GEN_IMG=f5devcentral/attributions-generator:latest
+ATTR_GEN_IMG=f5networksdevel/attributions-generator:latest
 docker pull ${ATTR_GEN_IMG}
 
 RUN_ARGS=( \

docs/conf.py

@@ -24,9 +24,6 @@
 sys.path.insert(0, os.path.abspath('../'))
 
 import f5_sphinx_theme
-import recommonmark
-import CommonMark
-from recommonmark.parser import CommonMarkParser
 
 # -- General configuration ------------------------------------------------
 
@@ -45,6 +42,7 @@
     'sphinx.ext.doctest',
     'sphinxjp.themes.basicstrap',
     'sphinx.ext.extlinks',
+    'recommonmark',
     'cloud_sptheme.ext.table_styling'
 ]
 
@@ -55,11 +53,12 @@
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
-source_suffix = ['.rst', '.md']
 
-source_parsers = {
-    '.md': CommonMarkParser,
-}
+source_suffix = {
+            '.rst': 'restructuredtext',
+            '.txt': 'markdown',
+            '.md': 'markdown',
+        }
 
 
 # The encoding of source files.

pkg/appmanager/appManager_test.go

@@ -3422,9 +3422,9 @@ var _ = Describe("AppManager Tests", func() {
 							Name: "foo",
 						},
 						TLS: &routeapi.TLSConfig{
-							Termination: "reencrypt",
-							Certificate: "cert",
-							Key:         "key",
+							Termination:              "reencrypt",
+							Certificate:              "cert",
+							Key:                      "key",
 							DestinationCACertificate: "destCaCert",
 						},
 					}
@@ -3630,9 +3630,9 @@ var _ = Describe("AppManager Tests", func() {
 							TargetPort: intstr.FromInt(80),
 						},
 						TLS: &routeapi.TLSConfig{
-							Termination: "edge",
-							Certificate: "cert",
-							Key:         "key",
+							Termination:                   "edge",
+							Certificate:                   "cert",
+							Key:                           "key",
 							InsecureEdgeTerminationPolicy: routeapi.InsecureEdgeTerminationPolicyRedirect,
 						},
 					}
@@ -3853,9 +3853,9 @@ var _ = Describe("AppManager Tests", func() {
 							},
 						},
 						TLS: &routeapi.TLSConfig{
-							Termination: "reencrypt",
-							Certificate: "cert",
-							Key:         "key",
+							Termination:              "reencrypt",
+							Certificate:              "cert",
+							Key:                      "key",
 							DestinationCACertificate: "destCaCert",
 						},
 					}

pkg/appmanager/profiles_test.go

@@ -308,9 +308,9 @@ var _ = Describe("AppManager Profile Tests", func() {
 					Name: "foo",
 				},
 				TLS: &routeapi.TLSConfig{
-					Termination: "reencrypt",
-					Certificate: "cert",
-					Key:         "key",
+					Termination:              "reencrypt",
+					Certificate:              "cert",
+					Key:                      "key",
 					DestinationCACertificate: "destCaCert",
 				},
 			}

requirements.txt

@@ -1 +1,2 @@
 -e git+https://github.com/f5devcentral/f5-ctlr-agent.git@671a0defbea9e7def753adb685cbd9230754f131#egg=f5-ctlr-agent
+-e git+https://github.com/f5devcentral/f5-cccl.git@cfaaa7713fddf9fe28400317548d25b104d3b865#egg=f5-cccl