.travis.yml

@@ -2,7 +2,7 @@ language: python
 
 cache: pip
 
-dist: trusty
+dist: xenial
 
 jobs:
   include:
@@ -15,15 +15,22 @@ jobs:
       after_success: codecov --disable search --flags unittests
 
     - stage: unit-test
-      python: "3.4"
-      env: TOXENV=py34-sqlite
+      python: "3.5"
+      env: TOXENV=py35-sqlite
       install: pip install codecov tox
       script: tox -- --exitfirst -m unit
       after_success: codecov --disable search --flags unittests
 
     - stage: unit-test
-      python: "3.5"
-      env: TOXENV=py35-sqlite
+      python: "3.6"
+      env: TOXENV=py36-sqlite
+      install: pip install codecov tox
+      script: tox -- --exitfirst -m unit
+      after_success: codecov --disable search --flags unittests
+
+    - stage: unit-test
+      python: "3.7"
+      env: TOXENV=py37-sqlite
       install: pip install codecov tox
       script: tox -- --exitfirst -m unit
       after_success: codecov --disable search --flags unittests
@@ -36,19 +43,32 @@ jobs:
       after_success: codecov --disable search --flags integrationtests
 
     - stage: integration-test
-      python: "3.4"
-      env: TOXENV=py34-sqlite
+      python: "3.5"
+      env: TOXENV=py35-sqlite
+      install: pip install codecov tox
+      script: tox -- --exitfirst -m functional -k 'not harvesting'
+      after_success: codecov --disable search --flags integrationtests
+
+    - stage: integration-test
+      python: "3.6"
+      env: TOXENV=py36-sqlite
       install: pip install codecov tox
       script: tox -- --exitfirst -m functional -k 'not harvesting'
       after_success: codecov --disable search --flags integrationtests
 
     - stage: integration-test
-      python: "3.5"
-      env: TOXENV=py35-sqlite
+      python: "3.7"
+      env: TOXENV=py37-sqlite
       install: pip install codecov tox
       script: tox -- --exitfirst -m functional -k 'not harvesting'
       after_success: codecov --disable search --flags integrationtests
 
+matrix:
+    allow_failures:
+      - env: TOXENV=py27-sqlite
+
+before_install:
+    - sudo apt-get update
 
 addons:
   apt:
@@ -65,3 +85,4 @@ notifications:
     channels:
       - "irc.freenode.org#pycsw"
     use_notice: true
+

CONTRIBUTING.rst

@@ -3,7 +3,7 @@ Contributing to pycsw
 
 The pycsw project openly welcomes contributions (bug reports, bug fixes, code
 enhancements/features, etc.).  This document will outline some guidelines on
-contributing to pycsw.  As well, the pycsw `community <http://pycsw.org/community/>`_ is a great place to
+contributing to pycsw.  As well, the pycsw `community <https://pycsw.org/community/>`_ is a great place to
 get an idea of how to connect and participate in pycsw community and development.
 
 pycsw has the following modes of contribution:
@@ -147,4 +147,4 @@ your own repository to ensure your pycsw repository is up to date with pycsw mas
 .. _`pylint`: http://www.logilab.org/857
 .. _`Sphinx`: http://sphinx-doc.org/
 .. _`developer tasks`: https://github.com/geopython/pycsw/wiki/Developer-Tasks
-.. _`mailing list`: http://pycsw.org/community#mailing-list
+.. _`mailing list`: https://pycsw.org/community#mailing-list

README.rst

@@ -20,4 +20,4 @@ metadata and catalogue component of spatial data infrastructures.
 pycsw is Open Source, released under an MIT license, and runs on all major 
 platforms (Windows, Linux, Mac OS X).
 
-Please read the docs at http://pycsw.org/docs for more information.
+Please read the docs at https://pycsw.org/docs for more information.

VERSION.txt

-2.2.0
+2.4.0

debian/changelog

-pycsw (2.2.0+dfsg-7) UNRELEASED; urgency=medium
+pycsw (2.4.0+dfsg-1~exp1) experimental; urgency=medium
 
+  * Team upload.
+  * New upstream release.
   * Make ronn generated manpage renaming more robust.
   * Remove package name from lintian overrides.
   * Drop python-pycsw-doc transitional package.
     (closes: #926569)
+  * Update copyright years for Tom Kralidis.
+  * Drop patches applied upstream, refresh remaining patches.
+  * Add apipkg & pytest build dependencies.
+  * Remove additional empty directories.
 
- -- Bas Couwenberg <sebastic@debian.org>  Tue, 05 Mar 2019 12:14:07 +0100
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 17 May 2019 21:18:16 +0200
 
 pycsw (2.2.0+dfsg-6) unstable; urgency=medium
 

debian/control

@@ -11,12 +11,16 @@ Build-Depends: apache2-dev,
                dh-python,
                procps,
                python-all,
+               python-apipkg,
                python-geolinks,
                python-lxml,
                python-mock,
                python-owslib,
                python-paver,
                python-pyproj,
+               python-pytest,
+               python-pytest-cov,
+               python-pytest-timeout,
                python-setuptools,
                python-shapely,
                python-six,
@@ -25,11 +29,15 @@ Build-Depends: apache2-dev,
                python-tz,
                python-xmltodict,
                python3-all,
+               python3-apipkg,
                python3-geolinks,
                python3-lxml,
                python3-mock,
                python3-owslib,
                python3-pyproj,
+               python3-pytest,
+               python3-pytest-cov,
+               python3-pytest-timeout,
                python3-setuptools,
                python3-shapely,
                python3-six,

debian/copyright

@@ -7,7 +7,7 @@ Disclaimer: The package is in non-free because it contains OGC schemas which
  limit modification via the terms of the Document Notice.
 
 Files: *
-Copyright: 2010-2017, Tom Kralidis
+Copyright: 2010-2019, Tom Kralidis
            2015-2017, Ricardo Garcia Silva
                 2016, James F. Dickens
            2011-2015, Angelos Tzotsos

debian/patches/0002-Remove-externally-linked-files.patch

@@ -18,7 +18,7 @@ W3C and jquery
          <script type="text/javascript">
              $(document).ready(function() {
                  $('.xml').change(function() {
-@@ -829,8 +829,6 @@
+@@ -843,8 +843,6 @@
              </ul>
          <hr/>
          <footer>

debian/patches/0004-Use-xdg-open-instead-of-firefox-in-desktop-file.patch

-From: Johan Van de Wauw <johan.vandewauw@gmail.com>
-Date: Tue, 30 Sep 2014 21:00:54 +0200
-Subject: Use xdg-open instead of firefox in desktop file
-
----
- etc/pycsw.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/etc/pycsw.desktop
-+++ b/etc/pycsw.desktop
-@@ -3,7 +3,7 @@ Type=Application
- Encoding=UTF-8
- Name=pycsw
- Comment=pycsw catalog server
--Exec=firefox http://localhost/pycsw/tests/index.html
-+Exec=xdg-open http://localhost/pycsw/tests/index.html
- Icon=/var/www/html/pycsw/docs/_static/pycsw-logo.png
- Terminal=false
- StartupNotify=false

debian/patches/0006-Don-t-include-external-references-to-images.patch

@@ -8,28 +8,32 @@ Subject: Don't include external references to images
 
 --- a/docs/_templates/indexsidebar.html
 +++ b/docs/_templates/indexsidebar.html
-@@ -1,19 +1,19 @@
+@@ -1,23 +1,19 @@
  <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>
+-    <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>
  </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 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>
  </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>
+-    <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>
  </p>
  
  <p>
--    <img alt="OSGeo Project" src="https://raw.githubusercontent.com/OSGeo/osgeo/master/incubation/project/OSGeo_project.png" height="64"/>
+-    <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>
 -    <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>
  </p>

debian/patches/0007-python-six-dependency.patch

-Description: Don't require exact version of python-six.
- Causes strict dependency: python-six (= 1.10.0)
-Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: not-needed
-
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -3,5 +3,5 @@ lxml==3.6.2
- OWSLib==0.16.0
- pyproj==1.9.5.1
- Shapely==1.5.17
--six==1.10.0
-+six>=1.10.0
- xmltodict==0.10.2

debian/patches/python3.7-async.patch

-Description: Rename 'async' property to fix SyntaxError with Python 3.7.
-Author: Bas Couwenberg <sebastic@debian.org>
-Bug-Debian: https://bugs.debian.org/903784
-Bug: https://github.com/geopython/pycsw/issues/570
-Forwarded: https://github.com/geopython/pycsw/pull/571
-Applied-Upstream: https://github.com/geopython/pycsw/commit/d0089732c5313f0aa376c57c34f47a9b7011d7d1
-
---- a/pycsw/ogc/csw/csw2.py
-+++ b/pycsw/ogc/csw/csw2.py
-@@ -1933,7 +1933,7 @@ class Csw2(object):
- 
-             node2.text = self.parent.request
- 
--        if self.parent.async:
-+        if self.parent.asynchronous:
-             etree.SubElement(node, util.nspath_eval('csw:RequestId',
-             self.parent.context.namespaces)).text = self.kvp['requestid']
- 
---- a/pycsw/ogc/csw/csw3.py
-+++ b/pycsw/ogc/csw/csw3.py
-@@ -2010,7 +2010,7 @@ class Csw3(object):
- 
-             node2.text = self.parent.request
- 
--        if self.parent.async:
-+        if self.parent.asynchronous:
-             etree.SubElement(node, util.nspath_eval('csw30:RequestId',
-             self.parent.context.namespaces)).text = self.parent.kvp['requestid']
- 
---- a/pycsw/server.py
-+++ b/pycsw/server.py
-@@ -75,7 +75,7 @@ class Csw(object):
-         self.kvp = {}
- 
-         self.mode = 'csw'
--        self.async = False
-+        self.asynchronous = False
-         self.soap = False
-         self.request = None
-         self.exception = False
-@@ -539,7 +539,7 @@ class Csw(object):
-             if 'responsehandler' in self.kvp:
-                 # set flag to process asynchronously
-                 import threading
--                self.async = True
-+                self.asynchronous = True
-                 request_id = self.kvp.get('requestid', None)
-                 if request_id is None:
-                     import uuid
-@@ -552,7 +552,7 @@ class Csw(object):
-             elif self.kvp['request'] == 'GetDomain':
-                 self.response = self.iface.getdomain()
-             elif self.kvp['request'] == 'GetRecords':
--                if self.async:  # process asynchronously
-+                if self.asynchronous:  # process asynchronously
-                     threading.Thread(target=self.iface.getrecords).start()
-                     self.response = self.iface._write_acknowledgement()
-                 else:
-@@ -564,7 +564,7 @@ class Csw(object):
-             elif self.kvp['request'] == 'Transaction':
-                 self.response = self.iface.transaction()
-             elif self.kvp['request'] == 'Harvest':
--                if self.async:  # process asynchronously
-+                if self.asynchronous:  # process asynchronously
-                     threading.Thread(target=self.iface.harvest).start()
-                     self.response = self.iface._write_acknowledgement()
-                 else:

debian/patches/series

 0001-Remove-google-analytics.patch
 0002-Remove-externally-linked-files.patch
-0004-Use-xdg-open-instead-of-firefox-in-desktop-file.patch
 0006-Don-t-include-external-references-to-images.patch
-0007-python-six-dependency.patch
-python3.7-async.patch

debian/rules

@@ -24,9 +24,7 @@ override_dh_auto_build:
 
 override_dh_auto_test:
 	PYBUILD_SYSTEM=custom \
-	PYBUILD_TEST_ARGS="cd {dir} && PYTHONPATH={dir} paver test" \
-	PYBUILD_AFTER_TEST="rm -rf {dir}/tests/results/" \
-	PYBUILD_DISABLE=test/python3 \
+	PYBUILD_TEST_ARGS="cd {dir} && PYTHONPATH={dir} {interpreter} -m pytest -v -k 'not harvesting' tests/" \
 	dh_auto_test || echo "Ignoring test failures"
 
 override_dh_auto_install:
@@ -35,7 +33,16 @@ override_dh_auto_install:
 override_dh_install:
 	dh_install --list-missing
 
+	# Remove pycache directories
+	$(RM) -r debian/*/usr/share/pycsw/tests/__pycache__/
+	$(RM) -r debian/*/usr/share/pycsw/tests/functionaltests/__pycache__/
+	$(RM) -r debian/*/usr/share/pycsw/tests/unittests/__pycache__/
+
 	# Remove empty directories
+	rmdir debian/*/usr/share/pycsw/tests/functionaltests/suites/apiso/export/
+	rmdir debian/*/usr/share/pycsw/tests/functionaltests/suites/duplicatefileid/export/
+	rmdir debian/*/usr/share/pycsw/tests/functionaltests/suites/idswithpaths/export/
+
 	rmdir debian/*/usr/share/pycsw/tests/functionaltests/suites/harvesting/data/
 	rmdir debian/*/usr/share/pycsw/tests/functionaltests/suites/manager/data/
 

default-sample.cfg

@@ -58,7 +58,7 @@ identification_keywords_type=theme
 identification_fees=None
 identification_accessconstraints=None
 provider_name=Organization Name
-provider_url=http://pycsw.org/
+provider_url=https://pycsw.org/
 contact_name=Lastname, Firstname
 contact_position=Position Title
 contact_address=Mailing Address

docker/docker-stack-pycsw.cfg

@@ -60,7 +60,7 @@ identification_keywords_type=theme
 identification_fees=None
 identification_accessconstraints=None
 provider_name=Organization Name
-provider_url=http://pycsw.org/
+provider_url=https://pycsw.org/
 contact_name=Lastname, Firstname
 contact_position=Position Title
 contact_address=Mailing Address

docker/pycsw.cfg

@@ -60,7 +60,7 @@ identification_keywords_type=theme
 identification_fees=None
 identification_accessconstraints=None
 provider_name=Organization Name
-provider_url=http://pycsw.org/
+provider_url=https://pycsw.org/
 contact_name=Lastname, Firstname
 contact_position=Position Title
 contact_address=Mailing Address