2.8.1 release

GeoNode · Aug 20, 2018 · 00471c2 · 00471c2
1 parent 15d9557
commit 00471c2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 17 deletions.
diff --git a/package/debian/changelog b/package/debian/changelog
@@ -1,4 +1,4 @@
-geonode (2.8.1+rc0) bionic; urgency=high 
+geonode (2.8.1+rc1) bionic; urgency=high
   * [62bc2f97e] Backporting PRs fixes from master: https://github.com/GeoNode/geonode/pull/3866 https://github.com/GeoNode/geonode/pull/3865 https://github.com/GeoNode/geonode/pull/3864
   * [1e2fdc228] Now there is not a local_settings.py file, so we need to set DATABASES when using worldmap application
   * [81f44237f] Includes commands in Makefile to create and remove databases needed when using the worldmap contrib application

diff --git a/package/debian/control b/package/debian/control
@@ -10,7 +10,7 @@ Vcs-git: git://github.com/GeoNode/geonode.git
 
 Package: geonode
 Architecture: all
-Depends: geoserver-geonode (==2.13.2), python-django (==1.8.19), python-virtualenv, python-lxml, python-psycopg2, python-amqp, python-anyjson, python-bs4, python-billiard, python-shapely, python-pil, python-nose, python-httplib2, gdal-bin, libgeos-dev, gettext, postgresql-contrib, postgis, libpq-dev, zip, unzip, libjpeg-dev, libpng12-dev, libxslt1-dev, zlib1g-dev, python-shapely, python-yaml, python-gdal, python-pyproj, libproj-dev, apache2, libapache2-mod-wsgi, python-dev, python-unidecode, python-paver, python-django-nose (==1.4.5), python-gsconfig, python-gn-gsimporter (==1.0.9), python-owslib, python-pycsw, python-chardet, python-decorator, python-six, python-diff-match-patch, python-django-extensions (==2.0.7), python-django-filter (==2.0.0), python-django-ipware (==2.1.0), python-django-jsonfield (==1.0.1), python-django-jsonfield-compat (==0.4.4), python-django-leaflet (==0.23.0), python-django-taggit (==0.22.2), python-django-treebeard (==4.2.1), python-django-mptt (==0.9.0), python-django-guardian (==1.4.9), python-django-suit (==0.2.26), python-django-tastypie (==0.14.0), python-dj-database-url, python-pinax-notifications, python-pinax-theme-bootstrap (==8.0.1), python-django-bootstrap-form (==3.4), python-django-forms-bootstrap (==3.1.0), python-django-friendly-tag-loader, python-django-activity-stream (==0.6.5), python-django-geoexplorer (==4.0.41), python-django-geoexplorer-worldmap (==4.0.47), python-django-appconf (==1.0.2), python-django-autocomplete-light (==2.3.3), python-django-autofixture (==0.12.1), python-django-autoslug (==1.9.3), python-django-geonode-client, python-django-braces (==1.12.0), python-django-modeltranslation (==0.12.2), python-geonode-user-messages (==0.1.14), python-geonode-avatar (==2.1.8), python-geonode-announcements (==1.0.13), python-geonode-agon-ratings (==0.3.8), python-geonode-dialogos (==0.9), python-django-downloadview (==1.9), python-geonode-notification, python-geolinks, python-multipartposthandler, python-dateutil, python-django-polymorphic (==1.3.1), language-pack-en, python-django-storages (==1.6.5), python-awesome-slugify, python-pip, python-django-oauth-toolkit (==0.12.0), python-oauthlib (==2.0.1), python-requests-oauthlib (==1.0.0), python-django-floppyforms (==1.7.0), python-django-crispy-forms (==1.7.2), python-django-invitations (==1.9.2), python-et-xmlfile, python-unicodecsv, python-urllib3, python-vine, python-django-cors-headers (==2.2.0), python-django-multi-email-field (==0.5.1), python-psutil, python-user-agents, python-xmljson, python-kombu, python-odfpy, python-sqlalchemy, python-arrow, python-backports.functools-lru-cache, python-certifi, python-click, python-dj-pagination, python-django-allauth (==0.34.0), python-django-apptemplates (==1.4), python-django-basic-authentication-decorator (==0.9), python-django-bootstrap3-datetimepicker-2 (==2.5.0), python-celery (==4.1.0),  python-django-celery-beat (==1.1.1), python-django-celery-monitor (==1.1.2), python-django-celery-results (==1.0.1), python-django-cuser (==2017.3.16), python-django-haystack (==2.8.1), python-django-import-export (==1.0.0), python-django-js-asset (==1.0.0), python-django-model-utils (==3.1.1), python-django-utils (==0.0.2), python-django-rest-swagger, python-django-reversion (==2.0.13), python-django-simple-history (==1.9.0), python-djangorestframework, python-drf-nested-routers, python-drf-openapi, python-inflection, python-itypes, python-openapi-codec, python-openpyxl, python-pep8, python-pinax-notifications, python-poster, python-pyshp, python-python-memcached, python-simplejson, python-typing, python-uritemplate, python-tablib, python-ua-parser, python-xlrd, python-xlwt, ${misc:Depends}, ${python:Depends}
+Depends: geoserver-geonode (= 2.13.2), python-django (= 1.8.19), python-virtualenv, python-lxml, python-psycopg2, python-amqp, python-anyjson, python-bs4, python-billiard, python-shapely, python-pil, python-nose, python-httplib2, gdal-bin, libgeos-dev, gettext, postgresql-contrib, postgis, libpq-dev, zip, unzip, libjpeg-dev, libpng-dev, libxslt1-dev, zlib1g-dev, python-shapely, python-yaml, python-gdal, python-pyproj, libproj-dev, apache2, libapache2-mod-wsgi, python-dev, python-unidecode, python-paver, python-django-nose (= 1.4.5), python-gsconfig, python-gn-gsimporter (= 1.0.9), python-owslib, python-pycsw, python-chardet, python-decorator, python-six, python-diff-match-patch, python-django-extensions (= 2.0.7), python-django-filter (= 2.0.0), python-django-ipware (= 2.1.0), python-django-jsonfield (= 1.0.1), python-django-jsonfield-compat (= 0.4.4), python-django-leaflet (= 0.23.0), python-django-taggit (= 0.22.2), python-django-treebeard (= 4.2.1), python-django-mptt (= 0.9.0), python-django-guardian (= 1.4.9), python-django-suit (= 0.2.26), python-django-tastypie (= 0.14.0), python-dj-database-url, python-pinax-notifications, python-pinax-theme-bootstrap (= 8.0.1), python-django-bootstrap-form (= 3.4), python-django-forms-bootstrap (= 3.1.0), python-django-friendly-tag-loader, python-django-activity-stream (= 0.6.5), python-django-geoexplorer (= 4.0.41), python-django-geoexplorer-worldmap (= 4.0.47), python-django-appconf (= 1.0.2), python-django-autocomplete-light (= 2.3.3), python-django-autofixture (= 0.12.1), python-django-autoslug (= 1.9.3), python-django-geonode-client, python-django-braces (= 1.12.0), python-django-modeltranslation (= 0.12.2), python-geonode-user-messages (= 0.1.14), python-geonode-avatar (= 2.1.8), python-geonode-announcements (= 1.0.13), python-geonode-agon-ratings (= 0.3.8), python-geonode-dialogos (= 0.9), python-django-downloadview (= 1.9), python-geolinks, python-multipartposthandler, python-dateutil, python-django-polymorphic (= 1.3.1), language-pack-en, python-django-storages (= 1.6.5), python-awesome-slugify, python-pip, python-django-oauth-toolkit (= 0.12.0), python-oauthlib (= 2.0.1), python-requests-oauthlib (= 1.0.0), python-django-floppyforms (= 1.7.0), python-django-crispy-forms (= 1.7.2), python-django-invitations (= 1.9.2), python-et-xmlfile, python-unicodecsv, python-urllib3, python-vine, python-django-cors-headers (= 2.2.0), python-django-multi-email-field (= 0.5.1), python-psutil, python-user-agents, python-xmljson, python-kombu, python-odfpy, python-sqlalchemy, python-arrow, python-backports.functools-lru-cache, python-certifi, python-click, python-dj-pagination, python-django-allauth (= 0.34.0), python-django-apptemplates (= 1.4), python-django-basic-authentication-decorator (= 0.9), python-django-bootstrap3-datetimepicker-2 (= 2.5.0), python-celery (= 4.1.0),  python-django-celery-beat (= 1.1.1), python-django-celery-monitor (= 1.1.2), python-django-celery-results (= 1.0.1), python-django-cuser (= 2017.3.16), python-django-haystack (= 2.8.1), python-django-import-export (= 1.0.0), python-django-js-asset (= 1.0.0), python-django-model-utils (= 3.1.1), python-django-utils (= 0.0.2), python-django-rest-swagger, python-django-reversion (= 2.0.13), python-django-simple-history (= 1.9.0), python-djangorestframework, python-inflection, python-itypes, python-openapi-codec, python-openpyxl, python-pep8, python-poster, python-pyshp, python-simplejson, python-typing, python-uritemplate, python-tablib, python-ua-parser, python-xlrd, python-xlwt, ${misc:Depends}, ${python:Depends}
 Recommends: python-gisdata, transifex-client
 Description: Allows the creation, sharing, and collaborative use of geospatial data.
  At its core, the GeoNode has a stack based on GeoServer, pycsw,

diff --git a/pavement.py b/pavement.py
@@ -1006,8 +1006,8 @@ def deb(options):
         # sh(('gbp dch --spawn-editor=snapshot --git-author --new-version=%s'
         #    ' --id-length=6 --ignore-branch --release' % (simple_version)))
         distribution = "bionic"
-        sh(('gbp dch --distribution=%s --force-distribution --spawn-editor=snapshot --git-author --new-version=%s'
-           ' --id-length=6 --ignore-branch --release' % (distribution, simple_version)))
+        # sh(('gbp dch --distribution=%s --force-distribution --spawn-editor=snapshot --git-author --new-version=%s'
+        #    ' --id-length=6 --ignore-branch --release' % (distribution, simple_version)))
 
         deb_changelog = path('debian') / 'changelog'
         for idx, line in enumerate(fileinput.input([deb_changelog], inplace=True)):
@@ -1020,16 +1020,16 @@ def deb(options):
         sh('rm -rf .git')
 
         if key is None and ppa is None:
-            # A local installable package
+            print("A local installable package")
             sh('debuild -uc -us -A')
         elif key is None and ppa is not None:
-                # A sources package, signed by daemon
+            print("A sources package, signed by daemon")
             sh('debuild -S')
         elif key is not None and ppa is None:
-            # A signed installable package
+            print("A signed installable package")
             sh('debuild -k%s -A' % key)
         elif key is not None and ppa is not None:
-            # A signed, source package
+            print("A signed, source package")
             sh('debuild -k%s -S' % key)
 
     if ppa is not None:
@@ -1044,21 +1044,28 @@ def publish():
         print "You need to set the GPG_KEY_GEONODE environment variable"
         return
 
+    if 'PPA_GEONODE' in os.environ:
+        ppa = os.environ['PPA_GEONODE']
+    else:
+        ppa = None
+
     call_task('deb', options={
         'key': key,
-        'ppa': 'geonode/testing',
+        'ppa': ppa,
+        # 'ppa': 'geonode/testing',
         # 'ppa': 'geonode/unstable',
     })
 
     version, simple_version = versions()
-    sh('git add package/debian/changelog')
-    sh('git commit -m "Updated changelog for version %s"' % version)
-    sh('git tag -f %s' % version)
-    sh('git push origin %s' % version)
-    sh('git tag -f debian/%s' % simple_version)
-    sh('git push origin debian/%s' % simple_version)
-    # sh('git push origin master')
-    sh('python setup.py sdist upload -r pypi')
+    if ppa:
+        sh('git add package/debian/changelog')
+        sh('git commit -m "Updated changelog for version %s"' % version)
+        sh('git tag -f %s' % version)
+        sh('git push origin %s' % version)
+        sh('git tag -f debian/%s' % simple_version)
+        sh('git push origin debian/%s' % simple_version)
+        # sh('git push origin master')
+        sh('python setup.py sdist upload -r pypi')
 
 
 def versions():