Merge pull request #290 from GSA/feature/update-deps

Update branch for CKAN 2.9 extensions
GSA · May 13, 2021 · 33a8ae8 · 33a8ae8
2 parents ba24875 + 5c993e1
commit 33a8ae8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -178,6 +178,8 @@ The Makefile target *update-dependencies* will use poetry to generate a new
 poetry can take several minutes to re-generate a lock file (in once case even up
 to 17 minutes)._
 
+    $ make update-dependencies
+
 To support sandbox installation via the ansible playbooks, there is a
 symbolic link `requirements-freeze.txt` that references
 `ckan/requirements.txt`.

diff --git a/ckan/requirements.txt b/ckan/requirements.txt
@@ -13,7 +13,7 @@ chardet==3.0.4
 -e git+https://github.com/ckan/ckan.git@1e10689a4e9936069cb1c0b2fc8bf630c530c246#egg=ckan
 -e git+https://github.com/ckan/ckanext-archiver.git@4cb10ac9f96fc78bc7be4b3dee8fbc56049b2865#egg=ckanext-archiver
 -e git+https://github.com/GSA/ckanext-datagovcatalog.git@2225231e129e4aacb35939dcd2765ed7f9216bb1#egg=ckanext-datagovcatalog
--e git+https://github.com/GSA/ckanext-datagovtheme.git@1853971076dc65c34bbf9864336c8de15bf9e6c9#egg=ckanext-datagovtheme
+-e git+https://github.com/GSA/ckanext-datagovtheme.git@50955d2d862fe880bda6b27e6c958432ef6da22c#egg=ckanext-datagovtheme
 -e git+https://github.com/GSA/ckanext-datajson.git@4ca1ca31cfcc23d6610c13693049fcfc83696d08#egg=ckanext-datajson
 -e git+https://github.com/ckan/ckanext-dcat@c285382e0c893a2dea7005729156f8bd3348ec54#egg=ckanext-dcat
 ckanext-envvars==0.0.1
@@ -101,7 +101,7 @@ routes==1.13
 rq==0.6.0
 shapely==1.7.1
 simplejson==3.10.0
-six==1.15.0
+six==1.16.0
 sparqlwrapper==1.8.5
 sqlalchemy==1.1.11
 sqlalchemy-migrate==0.10.0

diff --git a/requirements/poetry.lock b/requirements/poetry.lock
diff --git a/requirements/pyproject.toml b/requirements/pyproject.toml
@@ -10,8 +10,8 @@ python = "^2.7"
 ckan = {tag = "2.8", git = "https://github.com/ckan/ckan.git"}
 
 ckanext-archiver = {git = "https://github.com/ckan/ckanext-archiver.git"}
-ckanext-datagovtheme = {git = "https://github.com/GSA/ckanext-datagovtheme.git"}
-ckanext-datajson = {git = "https://github.com/GSA/ckanext-datajson.git" }
+ckanext-datagovtheme = {git = "https://github.com/GSA/ckanext-datagovtheme.git", branch = "main" }
+ckanext-datajson = {git = "https://github.com/GSA/ckanext-datajson.git", branch = "main" }
 ckanext-envvars = "*"
 ckanext-geodatagov = {git = "https://github.com/GSA/ckanext-geodatagov.git" }
 ckanext-harvest = {git = "https://github.com/ckan/ckanext-harvest.git" }