Merge branch 'release/0.6' into develop

Princeton-CDH · Dec 22, 2020 · 688704e · 688704e
2 parents 22dd7a9 + b1954a6
commit 688704e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/parasolr/__init__.py b/parasolr/__init__.py
@@ -1,7 +1,7 @@
 
 default_app_config = 'parasolr.apps.ParasolConfig'
 
-__version_info__ = (0, 6, 0, 'dev')
+__version_info__ = (0, 6, 0, None)
 
 # Dot-connect all but the last. Last is dash-connected if not None.
 __version__ = '.'.join([str(i) for i in __version_info__[:-1]])

diff --git a/requirements.lock b/requirements.lock
@@ -16,7 +16,7 @@ Jinja2==2.10.1
 MarkupSafe==1.1.1
 more-itertools==7.0.0
 packaging==19.0
--e git+git@github.com:Princeton-CDH/parasolr.git@29eab586fc73f01cb2e1c63846f16bf09253a693#egg=parasolr
+-e git+git@github.com:Princeton-CDH/parasolr.git@8e9cfff9aef6652b6c50d0c20a317f609f6b8b6a#egg=parasolr
 pkginfo==1.5.0.1
 pluggy==0.12.0
 pockets==0.7.2