[Git][debian-gis-team/mapproxy][master] 2 commits: Revert changes to upstream sources.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Sat Mar 22 09:52:47 GMT 2025
Bas Couwenberg pushed to branch master at Debian GIS Project / mapproxy
Commits:
0a5973de by Bas Couwenberg at 2025-03-22T10:46:51+01:00
Revert changes to upstream sources.
- - - - -
3f1aad8d by Bas Couwenberg at 2025-03-22T10:48:34+01:00
Set distribution to unstable.
- - - - -
14 changed files:
- debian/changelog
- mapproxy/service/templates/demo/tms_demo.html
- mapproxy/service/templates/demo/wms_demo.html
- mapproxy/service/templates/demo/wmts_demo.html
- mapproxy/source/mapnik.py
- mapproxy/test/system/test_util_wms_capabilities.py
- mapproxy/test/system/test_wms.py
- mapproxy/test/unit/test_cache.py
- mapproxy/test/unit/test_client.py
- mapproxy/test/unit/test_tiled_source.py
- mapproxy/test/unit/test_times.py
- mapproxy/util/ext/odict.py
- mapproxy/util/times.py
- mapproxy/version.py
Changes:
=====================================
debian/changelog
=====================================
@@ -1,8 +1,9 @@
-mapproxy (4.0.0+dfsg-1~exp2) UNRELEASED; urgency=medium
+mapproxy (4.0.0+dfsg-1) unstable; urgency=medium
* Update xfail.patch with tests failing in reprotest.
+ * Move from experimental to unstable.
- -- Bas Couwenberg <sebastic at debian.org> Sat, 22 Mar 2025 08:16:17 +0100
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 22 Mar 2025 10:37:36 +0100
mapproxy (4.0.0+dfsg-1~exp1) experimental; urgency=medium
=====================================
mapproxy/service/templates/demo/tms_demo.html
=====================================
@@ -14,9 +14,9 @@ menu_title= "TMS %s %s"%(layer.name, srs)
jscript_functions=None
}}
{{def jscript_openlayers}}
-<script src="https://cdn.jsdelivr.net/npm/ol@v7.3.0/dist/ol.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/proj4@2.9.0/dist/proj4.min.js"></script>
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/ol@v7.3.0/ol.css">
+<script src="static/ol.js"></script>
+<script src="static/proj4.min.js"></script>
+<link rel="stylesheet" href="static/ol.css">
<script type="text/javascript">
async function init() {
=====================================
mapproxy/service/templates/demo/wms_demo.html
=====================================
@@ -11,9 +11,9 @@ menu_title = "WMS %s %s" % (layer.name,srs)
jscript_functions=None
}}
{{def jscript_openlayers}}
-<script src="https://cdn.jsdelivr.net/npm/ol@v7.3.0/dist/ol.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/proj4@2.9.0/dist/proj4.min.js"></script>
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/ol@v7.3.0/ol.css">
+<script src="static/ol.js"></script>
+<script src="static/proj4.min.js"></script>
+<link rel="stylesheet" href="static/ol.css">
<script type="text/javascript">
async function init() {
=====================================
mapproxy/service/templates/demo/wmts_demo.html
=====================================
@@ -15,9 +15,9 @@ menu_title= "WMTS %s %s"%(layer.name, srs)
jscript_functions=None
}}
{{def jscript_openlayers}}
-<script src="https://cdn.jsdelivr.net/npm/ol@v7.3.0/dist/ol.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/proj4@2.9.0/dist/proj4.min.js"></script>
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/ol@v7.3.0/ol.css">
+<script src="static/ol.js"></script>
+<script src="static/proj4.min.js"></script>
+<link rel="stylesheet" href="static/ol.css">
<script type="text/javascript">
async function init() {
=====================================
mapproxy/source/mapnik.py
=====================================
@@ -226,7 +226,7 @@ class MapnikSource(MapLayer):
m = self.map_obj(mapfile)
m.resize(query.size[0], query.size[1])
- m.srs = str(query.srs.srs_code.lower())
+ m.srs = '+init=%s' % str(query.srs.srs_code.lower())
envelope = mapnik.Box2d(*query.bbox)
m.zoom_to_box(envelope)
data = None
=====================================
mapproxy/test/system/test_util_wms_capabilities.py
=====================================
@@ -36,7 +36,6 @@ SERVICE_EXCEPTION_FILE = os.path.join(
)
- at pytest.mark.xfail(strict=False, reason="ConnectionRefusedError")
class TestUtilWMSCapabilities(object):
def setup_method(self):
=====================================
mapproxy/test/system/test_wms.py
=====================================
@@ -391,7 +391,6 @@ class TestWMS111(SysTest):
assert validate_with_dtd(xml, "wms/1.1.1/exception_1_1_1.dtd")
- @pytest.mark.xfail(strict=False, reason="AssertionError")
def test_direct_layer_non_image_response(self, app):
self.common_map_req.params["layers"] = "direct"
expected_req = (
@@ -988,7 +987,6 @@ class TestWMS110(SysTest):
assert "No response from URL" in xml.xpath("//ServiceException/text()")[0]
assert validate_with_dtd(xml, "wms/1.1.0/exception_1_1_0.dtd")
- @pytest.mark.xfail(strict=False, reason="AppError")
@pytest.mark.flaky(reruns=5, reruns_delay=2)
def test_get_map(self, app, cache_dir):
with tmp_image((256, 256), format="jpeg") as img:
@@ -1240,7 +1238,6 @@ class TestWMS100(SysTest):
xml = resp.lxml
assert "No response from URL" in xml.xpath("//WMTException/text()")[0]
- @pytest.mark.xfail(strict=False, reason="AppError")
@pytest.mark.flaky(reruns=5, reruns_delay=2)
def test_get_map(self, app, cache_dir):
with tmp_image((256, 256), format="jpeg") as img:
@@ -1476,7 +1473,6 @@ class TestWMS130(SysTest):
)
assert validate_with_xsd(xml, xsd_name="wms/1.3.0/exceptions_1_3_0.xsd")
- @pytest.mark.xfail(strict=False, reason="AppError")
@pytest.mark.flaky(reruns=5, reruns_delay=2)
def test_get_map(self, app, cache_dir):
with tmp_image((256, 256), format="jpeg") as img:
=====================================
mapproxy/test/unit/test_cache.py
=====================================
@@ -882,7 +882,6 @@ class TestWMSSourceTransform(object):
"&format=image%2Fpng&styles=&srs=EPSG%3A4326&request=GetMap&height=450")
- at pytest.mark.xfail(strict=False, reason="ConnectionRefusedError")
class TestWMSSourceWithClient(object):
@pytest.fixture
=====================================
mapproxy/test/unit/test_client.py
=====================================
@@ -41,7 +41,6 @@ TESTSERVER_ADDRESS = ('127.0.0.1', 56413)
TESTSERVER_URL = 'http://%s:%s' % TESTSERVER_ADDRESS
- at pytest.mark.xfail(strict=False, reason="ConnectionRefusedError")
class TestHTTPClient(object):
def setup_method(self):
self.client = HTTPClient()
@@ -311,7 +310,6 @@ A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
"""
- at pytest.mark.xfail(strict=False, reason="ConnectionRefusedError")
class TestTileClient(object):
def test_tc_path(self):
template = TileURLTemplate(TESTSERVER_URL + '/%(tc_path)s.png')
@@ -360,7 +358,6 @@ class TestTileClient(object):
assert resp == b'tile'
- at pytest.mark.xfail(strict=False, reason="ConnectionRefusedError")
class TestWMSClient(object):
def test_no_image(self, caplog):
try:
=====================================
mapproxy/test/unit/test_tiled_source.py
=====================================
@@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import pytest
from mapproxy.client.tile import TileClient, TileURLTemplate
from mapproxy.grid import TileGrid
@@ -28,7 +27,6 @@ TEST_SERVER_ADDRESS = ("127.0.0.1", 56413)
TESTSERVER_URL = ("http://%s:%d" % TEST_SERVER_ADDRESS) + "/%(tms_path)s.png"
- at pytest.mark.xfail(strict=False, reason="ConnectionRefusedError")
class TestTileClientOnError(object):
def setup_method(self):
=====================================
mapproxy/test/unit/test_times.py
=====================================
@@ -17,7 +17,6 @@ from mapproxy.util.times import timestamp_from_isodate
import pytest
- at pytest.mark.xfail(strict=False, reason="Fails in reprotest")
def test_timestamp_from_isodate():
ts = timestamp_from_isodate("2009-06-09T10:57:00")
assert (1244537820.0 - 14 * 3600) < ts < (1244537820.0 + 14 * 3600)
=====================================
mapproxy/util/ext/odict.py
=====================================
@@ -108,6 +108,7 @@
"""
from __future__ import absolute_import
+from past.builtins import cmp
from copy import deepcopy
missing = object()
=====================================
mapproxy/util/times.py
=====================================
@@ -23,12 +23,6 @@ import calendar
from email.utils import parsedate
from wsgiref.handlers import format_date_time
-import os
-import pytest
-
-if 'SOURCE_DATE_EPOCH' in os.environ:
- pytest.skip("Fails in reprotest", allow_module_level=True)
-
def parse_httpdate(date):
date = parsedate(date)
=====================================
mapproxy/version.py
=====================================
@@ -23,34 +23,6 @@ def version_string():
"""
try:
return importlib.metadata.version('mapproxy')
- except importlib.metadata.PackageNotFoundError:
- import os
- import re
- import subprocess
-
- version = 'unknown_version'
- changelog_file = os.path.join(
- os.path.dirname(os.path.dirname(__file__)),
- 'debian',
- 'changelog',
- )
-
- if os.path.exists(changelog_file):
- cmd = [
- 'dpkg-parsechangelog',
- '-l', changelog_file,
- '-S', 'Version'
- ]
-
- p = subprocess.run(cmd, capture_output=True)
-
- if p.returncode == 0:
- version = p.stdout.decode()
- version = re.sub(r'^\d+:', '', version)
- version = re.sub(r'\+\S+$', '', version)
- version = re.sub(r'\~\S+$', '', version)
-
- return version
except KeyError:
return 'unknown_version'
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapproxy/-/compare/18fc6e86d3b1834c702563ea46d52253ffa662cb...3f1aad8d95203f290eb11d7ffcf241f55da99c0f
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapproxy/-/compare/18fc6e86d3b1834c702563ea46d52253ffa662cb...3f1aad8d95203f290eb11d7ffcf241f55da99c0f
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/20250322/ddd3a4b8/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list