-
Notifications
You must be signed in to change notification settings - Fork 20
fix(django): migrating to Django 5 #583
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 14 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
eaa0ac2
fix(django): migrating to Django 5
constantinius 6b0087f
ref: moving towards canonical Python 3
constantinius 98fdc21
fix: fixing exceptionhandler for recent versions of Pillow
constantinius d2cdf1c
fix: ComplexData default_format regression
constantinius 5d6dcbd
feat: Upgrage docker base image to ubuntu 24.04
constantinius afa65be
fix: reduce linting errors
constantinius cb08022
test: adjusting tests for recent Python/Django/MapServer versions
constantinius 3040bf3
fix: adjustments for recent Python version deprecations
constantinius 8f05e8c
fix: adaptations for recent mapscript API changes
constantinius a7d3dd3
fix: more linter fixes
constantinius b6eb2de
fix: removing remnant of six
constantinius 8df8e69
fix: pinning dependency version to the currently used major/minor
constantinius bd48e24
fix: dependency version
constantinius f6effc2
fix: linting issue
constantinius 73c4c86
fix(timetools): since we only allow ISO date/datetimes we can get rid…
constantinius fa52c2b
Fixing expected response for temporal test case
constantinius File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| #------------------------------------------------------------------------------- | ||
| # ------------------------------------------------------------------------------ | ||
| # | ||
| # Project: EOxServer <http://eoxserver.org> | ||
| # Authors: Stephan Krause <[email protected]> | ||
| # Stephan Meissl <[email protected]> | ||
| # Martin Paces <[email protected]> | ||
| # | ||
| #------------------------------------------------------------------------------- | ||
| # ------------------------------------------------------------------------------ | ||
| # Copyright (C) 2011 EOX IT Services GmbH | ||
| # | ||
| # Permission is hereby granted, free of charge, to any person obtaining a copy | ||
|
|
@@ -25,11 +25,11 @@ | |
| # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| # THE SOFTWARE. | ||
| #------------------------------------------------------------------------------- | ||
| # ------------------------------------------------------------------------------ | ||
|
|
||
| #----------------------------------------------------------------------- | ||
| # ---------------------------------------------------------------------- | ||
| # New style configuration | ||
| #----------------------------------------------------------------------- | ||
| # ---------------------------------------------------------------------- | ||
|
|
||
| [core.system] | ||
|
|
||
|
|
@@ -82,9 +82,9 @@ role=Service provider | |
| supported_crs=4326, # WGS84 | ||
| 3857, # WGS84 Pseudo-Mercator | ||
| 3035, #ETRS89 | ||
| 32661,32761, # WGS84 UPS-N and UPS-S | ||
| 32601,32602,32603,32604,32605,32606,32607,32608,32609,32610, # WGS84 UTM 1N-10N | ||
| 32611,32612,32613,32614,32615,32616,32617,32618,32619,32620, # WGS84 UTM 11N-20N | ||
| 32661,32761, # WGS84 UPS-N and UPS-S | ||
| 32601,32602,32603,32604,32605,32606,32607,32608,32609,32610, # WGS84 UTM 1N-10N | ||
| 32611,32612,32613,32614,32615,32616,32617,32618,32619,32620, # WGS84 UTM 11N-20N | ||
| 32621,32622,32623,32624,32625,32626,32627,32628,32629,32630, # WGS84 UTM 21N-30N | ||
| 32631,32632,32633,32634,32635,32636,32637,32638,32639,32640, # WGS84 UTM 31N-40N | ||
| 32641,32642,32643,32644,32645,32646,32647,32648,32649,32650, # WGS84 UTM 41N-50N | ||
|
|
@@ -96,7 +96,7 @@ supported_crs=4326, # WGS84 | |
| 32741,32742,32743,32744,32745,32746,32747,32748,32749,32750, # WGS84 UTM 41S-50S | ||
| 32751,32752,32753,32754,32755,32756,32757,32758,32759,32760 # WGS84 UTM 51S-60S | ||
|
|
||
| # file formats supported by WMS | ||
| # file formats supported by WMS | ||
| supported_formats=image/png,image/jpeg,image/gif,image/tiff | ||
|
|
||
| mask_names=clouds | ||
|
|
@@ -108,9 +108,9 @@ mask_names=clouds | |
| #supported_crs=4326, # WGS84 | ||
| # 3857, # WGS84 Pseudo-Mercator | ||
| # 3035, # ETRS89 | ||
| # 32661,32761, # WGS84 UPS-N and UPS-S | ||
| # 32601,32602,32603,32604,32605,32606,32607,32608,32609,32610, # WGS84 UTM 1N-10N | ||
| # 32611,32612,32613,32614,32615,32616,32617,32618,32619,32620, # WGS84 UTM 11N-20N | ||
| # 32661,32761, # WGS84 UPS-N and UPS-S | ||
| # 32601,32602,32603,32604,32605,32606,32607,32608,32609,32610, # WGS84 UTM 1N-10N | ||
| # 32611,32612,32613,32614,32615,32616,32617,32618,32619,32620, # WGS84 UTM 11N-20N | ||
| # 32621,32622,32623,32624,32625,32626,32627,32628,32629,32630, # WGS84 UTM 21N-30N | ||
| # 32631,32632,32633,32634,32635,32636,32637,32638,32639,32640, # WGS84 UTM 31N-40N | ||
| # 32641,32642,32643,32644,32645,32646,32647,32648,32649,32650, # WGS84 UTM 41N-50N | ||
|
|
@@ -122,7 +122,7 @@ mask_names=clouds | |
| # 32741,32742,32743,32744,32745,32746,32747,32748,32749,32750, # WGS84 UTM 41S-50S | ||
| # 32751,32752,32753,32754,32755,32756,32757,32758,32759,32760 # WGS84 UTM 51S-60S | ||
|
|
||
| # file formats supported by WCS (uncomment to set non-default values) | ||
| # file formats supported by WCS (uncomment to set non-default values) | ||
| supported_formats=image/tiff,image/jp2,application/x-netcdf,application/x-hdf,image/png | ||
|
|
||
| # the maximum size of output coverages | ||
|
|
@@ -165,18 +165,18 @@ cache_dir=/tmp | |
|
|
||
| [services.ows.wcst11] | ||
|
|
||
| #this flag enables/disable mutiple actions per WCSt request | ||
| # NOTE: it's much safer to keep this feature disabled | ||
| allow_multiple_actions=False | ||
| #this flag enables/disable mutiple actions per WCSt request | ||
| # NOTE: it's much safer to keep this feature disabled | ||
| allow_multiple_actions=False | ||
|
|
||
| # list enabled actions {Add,Delete,UpdateAll,UpdateMetadata,UpdateDataPart} | ||
| # set Add,Delete for the autotest configuration s | ||
| #allowed_actions=Add,Delete | ||
|
|
||
| # temporary storage | ||
| # temporary storage | ||
| path_wcst_temp=/var/eoxserver/autotest/autotest/wcst_temp | ||
|
|
||
| # permanent data storage | ||
| # permanent data storage | ||
| path_wcst_perm=/var/eoxserver/autotest/autotest/wcst_perm | ||
|
|
||
| [processing.gdal.reftools] | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| #------------------------------------------------------------------------------- | ||
| # ------------------------------------------------------------------------------ | ||
| # | ||
| # Project: EOxServer <http://eoxserver.org> | ||
| # Authors: Martin Paces <[email protected]> | ||
| # | ||
| #------------------------------------------------------------------------------- | ||
| # ------------------------------------------------------------------------------ | ||
| # Copyright (C) 2012 EOX IT Services GmbH | ||
| # | ||
| # Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| # of this software and associated documentation files (the "Software"), to deal | ||
| # in the Software without restriction, including without limitation the rights | ||
| # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| # copies of the Software, and to permit persons to whom the Software is | ||
| # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| # copies of the Software, and to permit persons to whom the Software is | ||
| # furnished to do so, subject to the following conditions: | ||
| # | ||
| # The above copyright notice and this permission notice shall be included in all | ||
|
|
@@ -23,14 +23,14 @@ | |
| # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| # THE SOFTWARE. | ||
| #------------------------------------------------------------------------------- | ||
| # ------------------------------------------------------------------------------ | ||
|
|
||
| #------------------------------------------------------------------------------- | ||
| # ------------------------------------------------------------------------------ | ||
| # This is the user provided list of supported file formats extending/overriding | ||
| # the EOxServer's default list of supported file formats. | ||
| # | ||
| # This configuration file is optional and it should not cause any harm | ||
| # to keep this file empty or omit it completely. | ||
| # This configuration file is optional and it should not cause any harm | ||
| # to keep this file empty or omit it completely. | ||
| # | ||
| # Line format: | ||
| # | ||
|
|
@@ -40,7 +40,7 @@ | |
| # | ||
| # We recommend to use MIME types as the unique identifiers in the first column. | ||
| # | ||
| #------------------------------------------------------------------------------- | ||
| # ------------------------------------------------------------------------------ | ||
|
|
||
| image/gif,GDAL/GIF,.gif | ||
| image/jp2,GDAL/JPEG2000,.jp2 # JasPer driver - left to assure functionality with GDAL having no OpenJpeg driver | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
autotest/autotest/expected/WCS20GetCoverageDatasetGeoTIFFCompressionInvalidTestCase.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <ows:ExceptionReport xmlns:ows="http://www.opengis.net/ows/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0.1" xml:lang="en" xsi:schemaLocation="http://www.opengis.net/ows/2.0 http://schemas.opengis.net/ows/2.0/owsAll.xsd"> | ||
| <ows:Exception exceptionCode="CompressionInvalid"> | ||
| <ows:ExceptionText>Unexpected value 'notValid'. Expected one of: 'None', 'PackBits', 'Huffman', 'LZW', 'JPEG', 'Deflate'.</ows:ExceptionText> | ||
| </ows:Exception> | ||
| </ows:ExceptionReport> |
6 changes: 6 additions & 0 deletions
6
autotest/autotest/expected/WCS20GetCoverageDatasetGeoTIFFCompressionNotSupportedTestCase.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <ows:ExceptionReport xmlns:ows="http://www.opengis.net/ows/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0.1" xml:lang="en" xsi:schemaLocation="http://www.opengis.net/ows/2.0 http://schemas.opengis.net/ows/2.0/owsAll.xsd"> | ||
| <ows:Exception exceptionCode="CompressionNotSupported" locator="geotiff:jpeg_quality"> | ||
| <ows:ExceptionText>geotiff:jpeg_quality requires compression method 'JPEG'.</ows:ExceptionText> | ||
| </ows:Exception> | ||
| </ows:ExceptionReport> |
6 changes: 6 additions & 0 deletions
6
autotest/autotest/expected/WCS20GetCoverageDatasetGeoTIFFInterleavingInvalidTestCase.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <ows:ExceptionReport xmlns:ows="http://www.opengis.net/ows/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0.1" xml:lang="en" xsi:schemaLocation="http://www.opengis.net/ows/2.0 http://schemas.opengis.net/ows/2.0/owsAll.xsd"> | ||
| <ows:Exception exceptionCode="InterleavingInvalid"> | ||
| <ows:ExceptionText>Unexpected value 'invalid'. Expected one of: 'Pixel', 'Band'.</ows:ExceptionText> | ||
| </ows:Exception> | ||
| </ows:ExceptionReport> |
Binary file modified
BIN
+142 KB
(20000%)
autotest/autotest/expected/WCS20GetCoverageDatasetGeoTIFFJPEGHighTestCase.tif
Binary file not shown.
Binary file modified
BIN
+56.2 KB
(7900%)
autotest/autotest/expected/WCS20GetCoverageDatasetGeoTIFFJPEGLowTestCase.tif
Binary file not shown.
6 changes: 6 additions & 0 deletions
6
autotest/autotest/expected/WCS20GetCoverageDatasetGeoTIFFJpegQualityInvalidTestCase.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <ows:ExceptionReport xmlns:ows="http://www.opengis.net/ows/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0.1" xml:lang="en" xsi:schemaLocation="http://www.opengis.net/ows/2.0 http://schemas.opengis.net/ows/2.0/owsAll.xsd"> | ||
| <ows:Exception exceptionCode="JpegQualityInvalid" locator="geotiff:jpeg_quality"> | ||
| <ows:ExceptionText>geotiff:jpeg_quality should be an integer between 1 and 100</ows:ExceptionText> | ||
| </ows:Exception> | ||
| </ows:ExceptionReport> |
6 changes: 6 additions & 0 deletions
6
autotest/autotest/expected/WCS20GetCoverageDatasetGeoTIFFPredictorInvalidTestCase.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <ows:ExceptionReport xmlns:ows="http://www.opengis.net/ows/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0.1" xml:lang="en" xsi:schemaLocation="http://www.opengis.net/ows/2.0 http://schemas.opengis.net/ows/2.0/owsAll.xsd"> | ||
| <ows:Exception exceptionCode="PredictorInvalid"> | ||
| <ows:ExceptionText>Unexpected value 'invalid'. Expected one of: 'None', 'Horizontal', 'FloatingPoint'.</ows:ExceptionText> | ||
| </ows:Exception> | ||
| </ows:ExceptionReport> |
6 changes: 6 additions & 0 deletions
6
autotest/autotest/expected/WCS20GetCoverageDatasetGeoTIFFPredictorNotSupportedTestCase.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <ows:ExceptionReport xmlns:ows="http://www.opengis.net/ows/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0.1" xml:lang="en" xsi:schemaLocation="http://www.opengis.net/ows/2.0 http://schemas.opengis.net/ows/2.0/owsAll.xsd"> | ||
| <ows:Exception exceptionCode="PredictorNotSupported" locator="geotiff:predictor"> | ||
| <ows:ExceptionText>geotiff:predictor requires compression method 'LZW' or 'Deflate'.</ows:ExceptionText> | ||
| </ows:Exception> | ||
| </ows:ExceptionReport> |
6 changes: 6 additions & 0 deletions
6
autotest/autotest/expected/WCS20GetCoverageDatasetGeoTIFFTilingInvalidTestCase.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <ows:ExceptionReport xmlns:ows="http://www.opengis.net/ows/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0.1" xml:lang="en" xsi:schemaLocation="http://www.opengis.net/ows/2.0 http://schemas.opengis.net/ows/2.0/owsAll.xsd"> | ||
| <ows:Exception exceptionCode="TilingInvalid" locator="geotiff:tiling"> | ||
| <ows:ExceptionText>geotiff:tiling requires geotiff:tilewidth and geotiff:tileheight to be set.</ows:ExceptionText> | ||
| </ows:Exception> | ||
| </ows:ExceptionReport> |
Binary file modified
BIN
-20 Bytes
(98%)
autotest/autotest/expected/WMS13GetMapCrossesDatelineDatasetTestCase.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-8 Bytes
(100%)
autotest/autotest/expected/WMS13GetMapNoServiceParameterTestCase.tif
Binary file not shown.
Binary file modified
BIN
+3 Bytes
(100%)
autotest/autotest/expected/WMS13GetMapReferenceableGridTestCase.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why did you go for venv? I've usually read to avoid this unless multi stage builds are used, but maybe it is also okay to avoid clashes with "system" dependencies
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, that was the reason. With the Python version used in Ubuntu 24.04 it was no longer possible to install user packages next to system ones without a venv.