Merge pull request #1316 from stevenc987/main

NR Duplicates Report#14287
bcgov · Dec 8, 2022 · fbd97bd · fbd97bd
2 parents 888bdcb + b4da776
commit fbd97bd
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 31 deletions.
diff --git a/jobs/nr-duplicates-report/Dockerfile b/jobs/nr-duplicates-report/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.8.5-buster
+FROM python:3.8.6-buster
 
 ARG VCS_REF="missing"
 ARG BUILD_DATE="missing"
@@ -8,7 +8,7 @@ ENV BUILD_DATE=${BUILD_DATE}
 
 LABEL org.label-schema.vcs-ref=${VCS_REF} \
     org.label-schema.build-date=${BUILD_DATE}
-    
+
 USER root
 
 # Create working directory
@@ -20,7 +20,7 @@ WORKDIR /opt/app-root
 COPY ./requirements.txt .
 
 #RUN pip install --upgrade pip
-RUN pip install pip==20.3.3
+RUN pip install pip==21.1.2
 RUN pip install --no-cache-dir -r requirements.txt
 
 COPY . .

diff --git a/jobs/nr-duplicates-report/openshift/templates/cronjob.yaml b/jobs/nr-duplicates-report/openshift/templates/cronjob.yaml
@@ -66,8 +66,7 @@ objects:
                     valueFrom:
                       secretKeyRef:
                         name: ${NAME}-${TAG}-secret
-                        key: DATABASE_PORT
-                                    - name: PG_USER
+                        key: DATABASE_PORT                  
                   - name: PAY_USER  
                     valueFrom:
                       secretKeyRef:

diff --git a/jobs/nr-duplicates-report/requirements.txt b/jobs/nr-duplicates-report/requirements.txt
@@ -20,19 +20,12 @@ jsonschema==3.2.0
 more-itertools==7.2.0
 six==1.14.0
 pyrsistent==0.16.0
-zipp==3.1.0
-
 Flask==1.1.2
-pytest
 Click==7.1.2
 python-dotenv==0.13.0
 requests==2.23.0
 marshmallow==2.20.5
 Werkzeug==0.16.1
 certifi==2020.4.5.1
 urllib3==1.25.9
-idna==2.9
-pylint
-pylint-flask
-pep8
-autopep8
+idna==2.9
diff --git a/jobs/nr-duplicates-report/requirements/dev.txt b/jobs/nr-duplicates-report/requirements/dev.txt
@@ -11,3 +11,9 @@ flake8-docstrings
 flake8-isort
 flake8-quotes
 pep8-naming
+
+pylint
+pylint-flask
+pep8
+autopep8
+coverage
diff --git a/jobs/nr-duplicates-report/requirements/prod.txt b/jobs/nr-duplicates-report/requirements/prod.txt
@@ -10,34 +10,22 @@ papermill
 schedule
 attrs==19.2.0
 future==0.18.2
-Jinja2==2.11.2
+Jinja2==3.0
 markupsafe==2.0.1
-python-dateutil==2.8.1
-pytz==2019.3
-importlib-metadata==1.6.0
+python-dateutil==2.8.2
+pytz==2020.1
+importlib-metadata==3.6.0
 itsdangerous==2.0.1
 jsonschema==3.2.0
 more-itertools==7.2.0
 six==1.14.0
 pyrsistent==0.16.0
-zipp==3.1.0
-
 Flask==1.1.2
-pytest
 Click==7.1.2
 python-dotenv==0.13.0
 requests==2.23.0
 marshmallow==2.20.5
 Werkzeug==0.16.1
 certifi==2020.4.5.1
 urllib3==1.25.9
-idna==2.9
-pylint
-pylint-flask
-pep8
-autopep8
-
-
-
-
-
+idna==2.9
diff --git a/jobs/nr-duplicates-report/run.sh b/jobs/nr-duplicates-report/run.sh
@@ -1,4 +1,4 @@
 #! /bin/sh
 cd /opt/app-root
-echo 'run notebookreport to generate Jupyter Notebook Report'
+echo 'run notebookreport to generate NR Duplicates Report'
 python notebookreport.py