[Git][debian-gis-team/pycsw][master] 5 commits: New upstream version 2.4.2+dfsg
Bas Couwenberg
gitlab at salsa.debian.org
Sat Jan 18 07:21:15 GMT 2020
Bas Couwenberg pushed to branch master at Debian GIS Project / pycsw
Commits:
859dc0b4 by Bas Couwenberg at 2020-01-18T07:59:52+01:00
New upstream version 2.4.2+dfsg
- - - - -
4ed44af1 by Bas Couwenberg at 2020-01-18T08:00:02+01:00
Update upstream source from tag 'upstream/2.4.2+dfsg'
Update to upstream version '2.4.2+dfsg'
with Debian dir 778adabc52d24984fb81148941d5be8748f0aa04
- - - - -
3b73b97e by Bas Couwenberg at 2020-01-18T08:01:00+01:00
New upstream release.
- - - - -
b245986e by Bas Couwenberg at 2020-01-18T08:07:34+01:00
Refresh patches.
- - - - -
217d1c96 by Bas Couwenberg at 2020-01-18T08:07:49+01:00
Set distribution to unstable.
- - - - -
8 changed files:
- VERSION.txt
- debian/changelog
- debian/patches/0006-Don-t-include-external-references-to-images.patch
- debian/patches/version-requirements.patch
- docs/_templates/indexsidebar.html
- pycsw/plugins/profiles/apiso/apiso.py
- requirements-standalone.txt
- requirements.txt
Changes:
=====================================
VERSION.txt
=====================================
@@ -1 +1 @@
-2.4.1
+2.4.2
=====================================
debian/changelog
=====================================
@@ -1,9 +1,12 @@
-pycsw (2.4.1+dfsg-2) UNRELEASED; urgency=medium
+pycsw (2.4.2+dfsg-1) unstable; urgency=medium
+ * Team upload.
+ * New upstream release.
* Bump Standards-Version to 4.4.1, no changes.
* Drop Name field from upstream metadata.
+ * Refresh patches.
- -- Bas Couwenberg <sebastic at debian.org> Mon, 30 Sep 2019 19:44:54 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 18 Jan 2020 08:07:40 +0100
pycsw (2.4.1+dfsg-1) unstable; urgency=medium
=====================================
debian/patches/0006-Don-t-include-external-references-to-images.patch
=====================================
@@ -8,32 +8,31 @@ Subject: Don't include external references to images
--- a/docs/_templates/indexsidebar.html
+++ b/docs/_templates/indexsidebar.html
-@@ -1,23 +1,19 @@
+@@ -1,23 +1,15 @@
<p>
-- <img alt="pycsw" src="https://raw.githubusercontent.com/geopython/pycsw/master/docs/_static/logo/logo-horizontal.png" height="119"/>
-+ <a title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 3.0.0. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." href="http://www.opengeospatial.org/resource/products/details/?pid=1374">This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 3.0.0. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." src="https://portal.opengeospatial.org/public_ogc/compliance/Certified_OGC_Compliant_Logo_Web.gif</a>
+- <img style="background: white;" alt="pycsw" src="https://raw.githubusercontent.com/geopython/pycsw/master/docs/_static/logo/logo-horizontal.png" height="75" />
++ <a title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 3.0.0. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." href="http://www.opengeospatial.org/resource/products/details/?pid=1374"><span title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 3.0.0. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries.">OGC CSW 3.0.0 compliant</span></a>
</p>
<p>
- <a title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 3.0.0. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." href="http://www.opengeospatial.org/resource/products/details/?pid=1374"><img alt="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 3.0.0. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." src="https://portal.opengeospatial.org/public_ogc/compliance/Certified_OGC_Compliant_Logo_Web.gif" height="74"/></a>
-+ <a title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 3.0.0. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." href="http://www.opengeospatial.org/resource/products/details/?pid=1374">This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 3.0.0. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." src="https://portal.opengeospatial.org/public_ogc/compliance/badge.php?s=CAT%20CSW%203.0.0&r=1</a>
++ <a title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 2.0.2. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." href="http://www.opengeospatial.org/resource/products/details/?pid=1374"><span title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 2.0.2. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries.">OGC CSW 2.0.2 compliant</span></a>
</p>
<p>
- <a title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 3.0.0. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." href="http://www.opengeospatial.org/resource/products/details/?pid=1374"><img alt="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 3.0.0. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." src="https://portal.opengeospatial.org/public_ogc/compliance/badge.php?s=CAT%20CSW%203.0.0&r=1" height="38"/></a>
-+ <a title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 2.0.2. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." href="http://www.opengeospatial.org/resource/products/details/?pid=1374">This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 2.0.2. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." src="https://portal.opengeospatial.org/public_ogc/compliance/badge.php?s=CAT%20CSW%202.0.2&r=1</a>
++ <a href="http://www.osgeo.org/">OSGeo Project</a>
</p>
<p>
- <a title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 2.0.2. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." href="http://www.opengeospatial.org/resource/products/details/?pid=1374"><img alt="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 2.0.2. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." src="https://portal.opengeospatial.org/public_ogc/compliance/badge.php?s=CAT%20CSW%202.0.2&r=1" height="38"/></a>
-+ OSGeo Project
- </p>
-
- <p>
-- <img alt="OSGeo Project" src="https://raw.githubusercontent.com/OSGeo/osgeo/master/incubation/project/OSGeo_project.png" height="64"/>
+-</p>
+-
+-<p>
+- <img style="background: white;" alt="OSGeo Project" src="https://raw.githubusercontent.com/OSGeo/osgeo/master/incubation/project/OSGeo_project.png" height="64"/>
-</p>
-
-<p>
- <script type="text/javascript" src="https://www.openhub.net/p/488022/widgets/project_thin_badge.js"></script>
-+<a href="https://www.openhub.net/p/pycsw">OpenHub Statistics</a>
++ <a href="https://www.openhub.net/p/pycsw">Open HUB</a>
</p>
=====================================
debian/patches/version-requirements.patch
=====================================
@@ -22,26 +22,3 @@ Author: Bas Couwenberg <sebastic at debian.org>
+pytest-flake8>=0.8.1
+pytest-timeout>=1.2.0
sphinx
---- a/requirements-standalone.txt
-+++ b/requirements-standalone.txt
-@@ -1 +1 @@
--SQLAlchemy==1.3.8
-+SQLAlchemy>=1.3.8
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1,7 +1,7 @@
--geolinks==0.2.0
--lxml==4.4.0
--OWSLib==0.18.0
--pyproj==2.2.1
--Shapely==1.6.4.post2
--six==1.12.0
--xmltodict==0.12.0
-\ No newline at end of file
-+geolinks>=0.2.0
-+lxml>=4.4.0
-+OWSLib>=0.18.0
-+pyproj>=2.2.1
-+Shapely>=1.6.4
-+six>=1.12.0
-+xmltodict>=0.11.0
=====================================
docs/_templates/indexsidebar.html
=====================================
@@ -1,5 +1,5 @@
<p>
- <img alt="pycsw" src="https://raw.githubusercontent.com/geopython/pycsw/master/docs/_static/logo/logo-horizontal.png" height="119"/>
+ <img style="background: white;" alt="pycsw" src="https://raw.githubusercontent.com/geopython/pycsw/master/docs/_static/logo/logo-horizontal.png" height="75" />
</p>
<p>
@@ -15,7 +15,7 @@
</p>
<p>
- <img alt="OSGeo Project" src="https://raw.githubusercontent.com/OSGeo/osgeo/master/incubation/project/OSGeo_project.png" height="64"/>
+ <img style="background: white;" alt="OSGeo Project" src="https://raw.githubusercontent.com/OSGeo/osgeo/master/incubation/project/OSGeo_project.png" height="64"/>
</p>
<p>
=====================================
pycsw/plugins/profiles/apiso/apiso.py
=====================================
@@ -386,7 +386,15 @@ class APISO(profile.Profile):
is_iso_anyway = False
xml_blob = util.getqattr(result, self.context.md_core_model['mappings']['pycsw:XML'])
- if caps is None and xml_blob is not None and xml_blob.startswith(b'<gmd:MD_Metadata'):
+
+ #xml_blob_decoded = bytes.fromhex(xml_blob[2:]).decode('utf-8')
+
+ if isinstance(xml_blob, bytes):
+ iso_string = b'<gmd:MD_Metadata>'
+ else:
+ iso_string = '<gmd:MD_Metadata>'
+
+ if caps is None and xml_blob is not None and xml_blob.startswith(iso_string):
is_iso_anyway = True
if (esn == 'full' and (typename == 'gmd:MD_Metadata' or is_iso_anyway)):
=====================================
requirements-standalone.txt
=====================================
@@ -1 +1 @@
-SQLAlchemy==1.3.8
+SQLAlchemy
=====================================
requirements.txt
=====================================
@@ -1,7 +1,7 @@
-geolinks==0.2.0
-lxml==4.4.0
-OWSLib==0.18.0
-pyproj==2.2.1
-Shapely==1.6.4.post2
-six==1.12.0
-xmltodict==0.12.0
\ No newline at end of file
+geolinks
+lxml
+OWSLib
+pyproj
+Shapely
+six
+xmltodict
\ No newline at end of file
View it on GitLab: https://salsa.debian.org/debian-gis-team/pycsw/compare/b99da5640294f1e6ce18728d448aef7f0934ec3e...217d1c9605ced7737cc3898fbcad97c14e52f9ca
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/pycsw/compare/b99da5640294f1e6ce18728d448aef7f0934ec3e...217d1c9605ced7737cc3898fbcad97c14e52f9ca
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200118/08dd7652/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list