Merge pull request #12 from GSA/feature/bump-dependencies

All dependencies bumped except for SQLAlchemy

Makefile

@@ -5,6 +5,9 @@ all: up
 build:
 	docker-compose build
 
+clean:
+	docker-compose down -v
+
 requirements:
 	docker-compose run --rm -T app pip --quiet freeze > requirements-freeze.txt
 
@@ -16,7 +19,8 @@ up:
 	docker-compose up
 
 up-with-data:
-	docker-compose up -f docker-compose.yml -f docker-compose.seed.yml
+	docker-compose -f docker-compose.yml -f docker-compose.seed.yml build
+	docker-compose -f docker-compose.yml -f docker-compose.seed.yml up
 
 update-dependencies:
 	docker-compose run --rm app pip install -r requirements.txt

requirements-freeze.txt

@@ -1,11 +1,11 @@
 Babel==0.9.6
 Beaker==1.6.4
-bleach==1.5.0
+bleach==2.1.3
 certifi==2019.11.28
 cffi==1.14.0
 chardet==3.0.4
--e git+https://github.com/GSA/ckan.git@c4ec614b49705860b05fa7d0e10c0ce7675e785e#egg=ckan
--e git+https://github.com/GSA/ckanext-datajson.git@8dfadc2b0a0d51012785644289826cca7f0003cb#egg=ckanext_datajson
+-e git+https://github.com/GSA/ckan.git@3e96d7f2a24d136fb2cfe60a51720e043f21369e#egg=ckan
+-e git+https://github.com/GSA/ckanext-datajson.git@0a3007a847d75d37e8c0130bada5bc4af7351d7b#egg=ckanext_datajson
 -e git+https://github.com/GSA/ckanext-googleanalyticsbasic.git@0b90194d77938e59ecb7d6937c201bd6815447f8#egg=ckanext_googleanalyticsbasic
 -e git+https://github.com/ckan/ckanext-harvest.git@13dbb1eea428e6b274f98c36bf29d42e62a70af7#egg=ckanext_harvest
 -e git+https://github.com/GSA/ckanext-saml2.git@0e1f11cb3b211e6d337b86ffe7c07620821f7d7d#egg=ckanext_saml2
@@ -17,11 +17,11 @@ enum34==1.1.6
 fanstatic==0.12
 FormEncode==1.2.6
 Genshi==0.6
-html5lib==0.9999999
+html5lib==1.0.1
 httplib2==0.17.0
 idna==2.7
 ipaddress==1.0.23
-Jinja2==2.6
+Jinja2==2.10.3
 jsonschema==2.4.0
 LEPL==5.1.3
 M2Crypto==0.23.0
@@ -39,7 +39,7 @@ pbr==0.8.2
 pika==0.9.8
 psycopg2==2.4.5
 pycparser==2.19
-Pygments==1.6
+Pygments==2.5.2
 Pylons==0.9.7
 pyOpenSSL==18.0.0
 -e git+https://github.com/GSA/pysaml2.git@8b605c824ff1d042e9040a9971c28f369197cac2#egg=pysaml2
@@ -56,7 +56,7 @@ requests==2.20.0
 rfc3987==1.3.8
 Routes==1.13
 simplejson==3.3.1
-six==1.7.3
+six==1.14.0
 solrpy==0.9.5
 SQLAlchemy==0.9.6
 sqlalchemy-migrate==0.9.1
@@ -66,8 +66,9 @@ tzlocal==1.5.1
 unicodecsv==0.9.4
 urllib3==1.24.3
 vdm==0.13
+webencodings==0.5.1
 WebError==0.10.3
 WebHelpers==1.3
-WebOb==1.0.8
+-e git+https://github.com/GSA/webob.git@90d895f9a85c8bea11c80efa4e2f6bdd04eabbe4#egg=WebOb
 WebTest==1.4.3
 zope.interface==4.1.1

requirements.txt

@@ -4,28 +4,30 @@
 -e git+https://github.com/GSA/USMetadata.git@master#egg=ckanext-usmetadata
 -e git+https://github.com/GSA/ckanext-googleanalyticsbasic.git@master#egg=ckanext-googleanalyticsbasic
 -e git+https://github.com/GSA/ckanext-saml2.git@max#egg=ckanext-saml2
+-e git+https://github.com/GSA/webob.git@ckan-patch#egg=webob
+Pylons==0.9.7
 
 # ckan dependencies
 Babel==0.9.6
 Beaker==1.6.4
-bleach~=1.5.0
+bleach==2.1.3
 FormEncode==1.2.6
 Genshi==0.6
-Jinja2==2.6
+Jinja2~=2.10.1
 Mako==0.9.0
 MarkupSafe==0.18
 Pairtree==0.7.1-T
 Paste==1.7.5.1
 PasteDeploy==1.5.0
 PasteScript==1.7.5
-Pygments==1.6
-Pylons==0.9.7
+Pygments==2.5.2
+
 Routes==1.13
 SQLAlchemy==0.9.6
 Tempita==0.5.2
 WebError==0.10.3
 WebHelpers==1.3
-WebOb==1.0.8
+
 WebTest==1.4.3
 argparse==1.2.1
 decorator==3.4.0
@@ -46,7 +48,7 @@ repoze.lru==0.6
 repoze.who==1.0.18
 repoze.who-friendlyform==1.0.8
 simplejson==3.3.1
-six==1.7.3
+six~=1.9
 solrpy==0.9.5
 sqlalchemy-migrate==0.9.1
 sqlparse==0.1.11

tests/test.bats

@@ -48,3 +48,7 @@ function test_login_and_datasets () {
   # Validate output is 22, curl response for 403 (Forbidden)
   [ "$status" -eq 22 ]
 }
+
+@test "Website display is working" {
+  curl --silent --fail http://app:5000/dataset/test-dataset-1 --cookie ./cookie-jar
+}