Skip to content
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.

Sign up for GitHub

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

Pin pyxform version with support for background-geopoint questions #5195

Closed
wants to merge 12 commits into from
Closed

Pin pyxform version with support for background-geopoint questions #5195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a411986
upgrading pyxform to 2.0.3 and fixing deployment errors due to format…
RuthShryock Sep 24, 2024
b82ad27
update tests to align with pyxform upgrade which includes updating XM…
RuthShryock Sep 24, 2024
f129a0a
update pyxform version to 2.1.1
RuthShryock Oct 22, 2024
3298bb0
update branch
RuthShryock Oct 22, 2024
97e6032
Ensure file is read correctly in by adding a check for in the save …
RuthShryock Oct 23, 2024
be7dc8d
Merge branch 'update-pyxform-version' into backport-background-geopoi…
RuthShryock Oct 23, 2024
82a54f5
Merge branch 'main' of github.com:kobotoolbox/kpi into backport-backg…
RuthShryock Oct 24, 2024
5f66b61
pin pyxform version to commit that includes support for background-ge…
RuthShryock Oct 24, 2024
3bdaa84
Merge branch 'main' of github.com:kobotoolbox/kpi into update-pyxform…
RuthShryock Oct 24, 2024
d717394
Merge branch 'update-pyxform-version' into backport-background-geopoi…
RuthShryock Oct 24, 2024
189e514
Merge remote-tracking branch 'origin/main' into backport-background-g…
jnm Nov 7, 2024
72e535f
Fix merge
jnm Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions dependencies/pip/dev_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
# via -r dependencies/pip/requirements.in
-e git+https://github.com/dimagi/python-digest@5c94bb74516b977b60180ee832765c0695ff2b56#egg=python_digest
# via -r dependencies/pip/requirements.in
-e git+https://github.com/XLSForm/pyxform.git@a724215f67c53bf529678125db15cae99cf61493#egg=pyxform
# via
# -r dependencies/pip/requirements.in
# formpack
-e git+https://github.com/kobotoolbox/ssrf-protect@9b97d3f0fd8f737a38dd7a6b64efeffc03ab3cdd#egg=ssrf_protect
# via -r dependencies/pip/requirements.in
aiohttp==3.9.3
Expand Down Expand Up @@ -537,10 +541,6 @@ pytz==2024.1
# via
# flower
# pandas
pyxform==2.1.1
# via
# -r dependencies/pip/requirements.in
# formpack
pyyaml==6.0.1
# via responses
redis==5.0.3
Expand Down
4 changes: 3 additions & 1 deletion dependencies/pip/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
# using a fork for django > 1.1.0 compatibility
-e git+https://github.com/trevoriancox/django-dont-vary-on.git@01a804122b7ddcdc22f50b40993f91c27b03bef6#egg=django-dont-vary-on

# pyxform
-e git+https://github.com/XLSForm/pyxform.git@a724215f67c53bf529678125db15cae99cf61493#egg=pyxform

# Regular PyPI packages
Django>=4.2,<4.3
Markdown
Expand Down Expand Up @@ -75,7 +78,6 @@ openpyxl
psycopg
pymongo
python-dateutil
pyxform==2.1.1
requests
regex
responses
Expand Down
8 changes: 4 additions & 4 deletions dependencies/pip/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
# via -r dependencies/pip/requirements.in
-e git+https://github.com/dimagi/python-digest@5c94bb74516b977b60180ee832765c0695ff2b56#egg=python_digest
# via -r dependencies/pip/requirements.in
-e git+https://github.com/XLSForm/pyxform.git@a724215f67c53bf529678125db15cae99cf61493#egg=pyxform
# via
# -r dependencies/pip/requirements.in
# formpack
-e git+https://github.com/kobotoolbox/ssrf-protect@9b97d3f0fd8f737a38dd7a6b64efeffc03ab3cdd#egg=ssrf_protect
# via -r dependencies/pip/requirements.in
aiohttp==3.9.3
Expand Down Expand Up @@ -412,10 +416,6 @@ pytz==2024.1
# via
# flower
# pandas
pyxform==2.1.1
# via
# -r dependencies/pip/requirements.in
# formpack
pyyaml==6.0.1
# via responses
redis==5.0.3
Expand Down
1 change: 1 addition & 0 deletions jsapp/xlform/src/model.row.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ $skipLogicHelpers = require './mv.skipLogicHelpers'
readParameters = require('../../js/components/formBuilder/formBuilderUtils').readParameters
writeParameters = require('../../js/components/formBuilder/formBuilderUtils').writeParameters
txtid = require('js/utils').txtid
notify = require('js/utils').notify

module.exports = do ->
row = {}
Expand Down
Loading