Allow geometry-less models #285

3nids · 2023-09-27T21:16:47Z

A null geometry is returned in such case

Fixes #282

auvipy

thanks for the patch! this will need additional test as well. something like using the code examples from the issue you reported.

nemesifier

Thanks for the patch @3nids, we need at least 1 test for this and a 1 lines of text to explain its usage in the README.

Please also check the build failure to see how to fix those QA issues.

3nids · 2023-09-28T10:07:42Z

Thank for the feedback!
I added some tests.
May I ask why running the test workflow requires an approval? It would ease the process to have a quicker feedback.
Cheers.

nemesifier

@3nids keep in mind the commit message QA checks run on each commit, you can run those locally. with ./run-qa-checks

auvipy · 2023-10-08T07:51:51Z

api.py", line 150, in pass_env_post_process
raise Fail(msg)
tox.tox_env.errors.Fail: pass_env values cannot contain whitespace, use comma to have multiple values in a single line, invalid values found 'TRAVIS TRAVIS_*'
Error: Process completed with exit code 1.

3nids · 2023-10-10T05:32:48Z

I made something wrong with my last force push, trying again.

auvipy · 2023-10-10T06:20:31Z

hope this will be green this time!

3nids · 2023-10-10T06:39:24Z

Looks like I didn't run makemigrations.
hopefully I'll be back...

auvipy · 2023-10-28T09:02:35Z

Done

auvipy

Can you please check why this error is occuring?

tox -e py39-django32-djangorestframework312
shell: /usr/bin/bash -e {0}
env:
pythonLocation: /opt/hostedtoolcache/Python/3.9.18/x64
LD_LIBRARY_PATH: /opt/hostedtoolcache/Python/3.9.18/x64/lib
POSTGRES_HOST: localhost
Traceback (most recent call last):
File "/opt/hostedtoolcache/Python/3.9.18/x64/bin/tox", line 8, in
sys.exit(run())
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/run.py", line 19, in run
result = main(sys.argv[1:] if args is None else args)
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/run.py", line 45, in main
return handler(state)
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/session/cmd/legacy.py", line 115, in legacy
return run_sequential(state)
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/session/cmd/run/sequential.py", line 24, in run_sequential
return execute(state, max_workers=1, has_spinner=False, live=True)
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/session/cmd/run/common.py", line 236, in execute
state.envs.ensure_only_run_env_is_active()
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/session/env_select.py", line 416, in ensure_only_run_env_is_active
envs, active = self._defined_envs, self._env_name_to_active()
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/session/env_select.py", line 273, in _defined_envs
raise failed[next(iter(failed_to_create))]
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/session/env_select.py", line 250, in _defined_envs
run_env.package_env = self._build_pkg_env(pkg_name_type, name, env_name_to_active)
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/session/env_select.py", line 321, in _build_pkg_env
name_type = next(child_package_envs)
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/tox_env/python/virtual_env/package/pyproject.py", line 173, in register_run_env
yield from super().register_run_env(run_env)
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/tox_env/python/package.py", line 116, in register_run_env
pkg_env = run_env.conf["wheel_build_env"]
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/config/sets.py", line 118, in getitem
return self.load(item)
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/config/sets.py", line 129, in load
return config_definition.call(self._conf, self.loaders, ConfigLoadArgs(chain, self.name, self.env_name))
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/config/of_type.py", line 105, in call
value = self.default(conf, args.env_name) if callable(self.default) else self.default
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/tox_env/python/package.py", line 92, in default_wheel_tag
run_py = cast(Python, run_env).base_python
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/tox_env/python/api.py", line 250, in base_python
self._base_python = self._get_python(base_pythons)
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/tox_env/python/virtual_env/api.py", line 134, in _get_python
interpreter = self.creator.interpreter
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/tox_env/python/virtual_env/api.py", line 126, in creator
return self.session.creator
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/tox_env/python/virtual_env/api.py", line 106, in session
env = self.virtualenv_env_vars()
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/tox_env/python/virtual_env/api.py", line 111, in virtualenv_env_vars
env = self.environment_variables.copy()
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/tox_env/python/virtual_env/api.py", line 166, in environment_variables
environment_variables = super().environment_variables
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/tox_env/runner.py", line 193, in environment_variables
environment_variables = super().environment_variables
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/tox_env/api.py", line 330, in environment_variables
pass_env: list[str] = self.conf["pass_env"]
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/config/sets.py", line 118, in getitem
return self.load(item)
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/config/sets.py", line 129, in load
return config_definition.call(self.conf, self.loaders, ConfigLoadArgs(chain, self.name, self.env_name))
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/config/of_type.py", line 107, in call
value = self.post_process(value)
File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/tox/tox_env/api.py", line 150, in pass_env_post_process
raise Fail(msg)
tox.tox_env.errors.Fail: pass_env values cannot contain whitespace, use comma to have multiple values in a single line, invalid values found 'TRAVIS TRAVIS*'
Error: Process completed with exit code 1.

3nids · 2023-10-30T07:46:29Z

I haven't touched anything in tox.ini, quite strange.
But I was wondering why there was some reference to TRAVIS variables in it? remains from the past? Maybe this needs to be dropped?

nemesifier

@3nids please try rebasing on the latest master to get rid of some errors.

3nids · 2023-10-30T21:04:15Z

done, thanks!

nemesifier · 2024-02-15T16:22:26Z

Triggered @3nids

3nids · 2024-03-04T13:42:42Z

@nemesifier thanks to the help from @suricactus this should be good now. That'd be great to re trigger the tests! Cheers!

nemesifier

It's good to see progress on this! Ran the build, 1 test failing, please check. See also my suggestion below.

nemesifier · 2024-03-04T17:40:57Z

rest_framework_gis/serializers.py

-        processed_fields.add(self.Meta.geo_field)
+        # geometry attribute
+        # must be present in output according to GeoJSON spec
+        if self.Meta.geo_field:


Suggested change

if self.Meta.geo_field:

if self.Meta.geo_field is not None:

I think this is good like this, we want to ignore stuff like "" or 0 that ended up here by accident.

suricactus · 2024-03-04T22:41:04Z

@3nids this makes all tests to pass locally. Forgot to commit last time: 3nids#2

3nids · 2024-03-05T05:59:25Z

@nemesifier thanks again, should be good this time 🤞

nemesifier

Thx for the reminder, I restarted the build, there still seems to be one test failing.

suricactus · 2024-03-19T00:33:36Z

rest_framework_gis/serializers.py

@@ -118,7 +123,7 @@ def to_representation(self, instance):
        processed_fields = set()

        # optional id attribute
-        if self.Meta.id_field:
+        if self.Meta.id_field is not None:


Suggested change

if self.Meta.id_field is not None:

if self.Meta.id_field:

This somehow slipped in the force-pushed commit. In the PR I quoted earlier 3nids#2, this line is not modified and is as in the suggestion.

Note this is required by the exact test that is failing, namely test_geojson_false_id_attribute_slug which tests when the id_field = False. In that case having a strict check like this self.Meta.id_field is not None will fail and cause the serializer to search for field named False.

fixes openwisp#282

3nids · 2024-03-19T07:46:28Z

@nemesifier @suricactus I just dropped the 2 is not None and pushed.
Could you retrigger the tests?
cheers!

3nids · 2024-03-21T05:34:03Z

@nemesifier gentle ping :)

nemesifier

Thanks @auvipy @suricactus 👍 👏

auvipy requested changes Sep 28, 2023

View reviewed changes

nemesifier requested changes Sep 28, 2023

View reviewed changes

3nids force-pushed the patch-1 branch from 66bd92c to cdf2686 Compare September 28, 2023 10:05

3nids force-pushed the patch-1 branch from cdf2686 to 445bec5 Compare September 28, 2023 12:24

nemesifier reviewed Sep 28, 2023

View reviewed changes

3nids force-pushed the patch-1 branch 4 times, most recently from 3b640c6 to 93d9718 Compare September 29, 2023 08:25

3nids force-pushed the patch-1 branch from 93d9718 to 3903921 Compare October 6, 2023 07:37

3nids force-pushed the patch-1 branch 2 times, most recently from 3b640c6 to 1cb9c89 Compare October 10, 2023 05:32

auvipy self-requested a review October 10, 2023 06:20

This comment was marked as outdated.

Sign in to view

3nids force-pushed the patch-1 branch 3 times, most recently from 6109610 to 14eae96 Compare October 18, 2023 06:13

This comment was marked as outdated.

Sign in to view

3nids closed this Oct 19, 2023

3nids reopened this Oct 19, 2023

3nids requested a review from nemesifier October 20, 2023 04:06

3nids force-pushed the patch-1 branch from 14eae96 to 74efdc3 Compare October 23, 2023 06:21

This comment was marked as outdated.

Sign in to view

auvipy requested changes Oct 28, 2023

View reviewed changes

3nids closed this Oct 30, 2023

3nids reopened this Oct 30, 2023

nemesifier requested changes Oct 30, 2023

View reviewed changes

3nids force-pushed the patch-1 branch from cb126e7 to a1741a7 Compare October 30, 2023 21:03

3nids requested a review from nemesifier October 31, 2023 13:39

This comment was marked as outdated.

Sign in to view

3nids mentioned this pull request Jan 22, 2024

support geometry less layers opengisch/django-oapif#111

Closed

3nids closed this Feb 15, 2024

3nids reopened this Feb 15, 2024

This comment was marked as outdated.

Sign in to view

3nids force-pushed the patch-1 branch from f6df4bd to bb342c7 Compare March 4, 2024 13:41

nemesifier requested changes Mar 4, 2024

View reviewed changes

3nids force-pushed the patch-1 branch from 0e446dc to d9298a5 Compare March 5, 2024 05:58

This comment was marked as outdated.

Sign in to view

nemesifier reviewed Mar 15, 2024

View reviewed changes

suricactus reviewed Mar 19, 2024

View reviewed changes

[feature] Allow geometry-less models openwisp#282

fb65eec

fixes openwisp#282

3nids force-pushed the patch-1 branch from d9298a5 to fb65eec Compare March 19, 2024 07:45

nemesifier approved these changes Mar 21, 2024

View reviewed changes

nemesifier merged commit 4f244d5 into openwisp:master Mar 21, 2024
22 of 24 checks passed

3nids deleted the patch-1 branch April 3, 2024 14:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow geometry-less models #285

Allow geometry-less models #285

3nids commented Sep 27, 2023

auvipy left a comment

nemesifier left a comment

3nids commented Sep 28, 2023 •

edited

Loading

nemesifier left a comment

auvipy commented Oct 8, 2023

3nids commented Oct 10, 2023

auvipy commented Oct 10, 2023

3nids commented Oct 10, 2023

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

auvipy commented Oct 28, 2023

auvipy left a comment

3nids commented Oct 30, 2023

nemesifier left a comment

3nids commented Oct 30, 2023

This comment was marked as outdated.

This comment was marked as outdated.

nemesifier commented Feb 15, 2024

3nids commented Mar 4, 2024

nemesifier left a comment

nemesifier Mar 4, 2024

suricactus Mar 4, 2024

suricactus commented Mar 4, 2024

3nids commented Mar 5, 2024

This comment was marked as outdated.

nemesifier left a comment

suricactus Mar 19, 2024

3nids commented Mar 19, 2024

3nids commented Mar 21, 2024

nemesifier left a comment

Allow geometry-less models #285

Allow geometry-less models #285

Conversation

3nids commented Sep 27, 2023

auvipy left a comment

Choose a reason for hiding this comment

nemesifier left a comment

Choose a reason for hiding this comment

3nids commented Sep 28, 2023 • edited Loading

nemesifier left a comment

Choose a reason for hiding this comment

auvipy commented Oct 8, 2023

3nids commented Oct 10, 2023

auvipy commented Oct 10, 2023

3nids commented Oct 10, 2023

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

auvipy commented Oct 28, 2023

auvipy left a comment

Choose a reason for hiding this comment

3nids commented Oct 30, 2023

nemesifier left a comment

Choose a reason for hiding this comment

3nids commented Oct 30, 2023

This comment was marked as outdated.

This comment was marked as outdated.

nemesifier commented Feb 15, 2024

3nids commented Mar 4, 2024

nemesifier left a comment

Choose a reason for hiding this comment

nemesifier Mar 4, 2024

Choose a reason for hiding this comment

suricactus Mar 4, 2024

Choose a reason for hiding this comment

suricactus commented Mar 4, 2024

3nids commented Mar 5, 2024

This comment was marked as outdated.

nemesifier left a comment

Choose a reason for hiding this comment

suricactus Mar 19, 2024

Choose a reason for hiding this comment

3nids commented Mar 19, 2024

3nids commented Mar 21, 2024

nemesifier left a comment

Choose a reason for hiding this comment

3nids commented Sep 28, 2023 •

edited

Loading