Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
3f6314a
Use flags from `Qgis` and further improve typing
suricactus Feb 18, 2026
d972c84
Rename XLSFormConverterAlgorithm to XlsformConverterAlgorithm
suricactus Mar 10, 2026
7fd2bcd
Refactor the xlsformconverter to use the new json2qgis two step mecha…
suricactus Mar 10, 2026
d1b4993
Fix imports and use set_survey_features
suricactus Mar 11, 2026
ac3f11b
Fix imports from `convert2qgis`
suricactus Mar 11, 2026
a6cede3
Use snake_case and prefix with underscore
suricactus Mar 13, 2026
e63f0eb
Remove disconnect logging
suricactus Mar 13, 2026
fdc636e
Drop feedback as a dependency
suricactus Mar 14, 2026
2f90355
Set extent based on the survey features
suricactus Mar 15, 2026
e7299a5
Properly import dependencies on top of the file
suricactus Mar 16, 2026
8c54a21
Use `convert2qgis`
suricactus Mar 16, 2026
89f4ee5
Bump convert2qgis
suricactus Mar 16, 2026
4fa1978
Bump convert2qgis so `unidecode` is not hard dependency
suricactus Mar 16, 2026
d74ad4c
Less capitals in file, module and class names
suricactus Mar 16, 2026
33f4309
The `converter` file was renamed to `xlsform2qgis`
suricactus May 11, 2026
a772848
Bump `convert2qgis`
suricactus May 15, 2026
395f210
Fix typo in `_logging_callabcks`
suricactus May 18, 2026
8054257
Better typing when adding existing features
suricactus May 18, 2026
f059e5c
Fix setting extent
suricactus May 18, 2026
3ac02d1
Print the actual QGIS project filename
suricactus May 18, 2026
9dcf6a7
Improved extent related logs
suricactus May 18, 2026
484ff67
Reduce the extent related logs
suricactus May 19, 2026
91e60f7
Bump `convert2qgis`
suricactus May 18, 2026
ec4edf7
Pass the `use_groups_as_tabs` as a xlsform2qgis setting
suricactus May 20, 2026
c5f4497
Bump `convert2qgis`
suricactus May 21, 2026
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
20 changes: 10 additions & 10 deletions .github/workflows/continuous_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,23 @@ jobs:
sudo apt update && sudo apt install qtbase5-dev qttools5-dev-tools
sudo pip install qgis-plugin-ci --break-system-packages

- name: Package xlsform2qgis
- name: Package convert2qgis
run: |
pip wheel $(grep -o -P '(https://.*.tar.gz)' requirements.txt)
XLSFORM2QGIS_COMMIT_SHA=$(echo $(grep -o -P '((https://github\.com/opengisch/xlsform2qgis/.*.tar.gz))' requirements.txt) | grep -Eo '[0-9a-f]{40}')
mv xlsform2qgis-*.whl xlsformconverter/xlsform2qgis_${XLSFORM2QGIS_COMMIT_SHA}.whl
CONVERT2QGIS_COMMIT_SHA=$(echo $(grep -o -P '((https://github\.com/opengisch/convert2qgis/.*.tar.gz))' requirements.txt) | grep -Eo '[0-9a-f]{40}')
mv convert2qgis-*.whl xlsformconverter/convert2qgis_${CONVERT2QGIS_COMMIT_SHA}.whl

- name: Release
run: |
XLSFORM2QGIS_COMMIT_SHA=$(echo $(grep -o -P '((https://github\.com/opengisch/xlsform2qgis/.*.tar.gz))' requirements.txt) | grep -Eo '[0-9a-f]{40}')
CONVERT2QGIS_COMMIT_SHA=$(echo $(grep -o -P '((https://github\.com/opengisch/convert2qgis/.*.tar.gz))' requirements.txt) | grep -Eo '[0-9a-f]{40}')
RELEASE_VERSION=${GITHUB_REF##*/}
RELEASE_TAG=${GITHUB_REF##*/}
qgis-plugin-ci release ${RELEASE_VERSION} \
--release-tag ${RELEASE_TAG} \
--github-token ${GITHUB_TOKEN} \
--osgeo-username ${OSGEO_USERNAME} \
--osgeo-password ${OSGEO_PASSWORD} \
--asset-path xlsformconverter/xlsform2qgis_${XLSFORM2QGIS_COMMIT_SHA}.whl
--asset-path xlsformconverter/convert2qgis_${CONVERT2QGIS_COMMIT_SHA}.whl

package:
runs-on: ubuntu-24.04
Expand All @@ -65,17 +65,17 @@ jobs:
sudo apt update && sudo apt install qtbase5-dev qttools5-dev-tools
sudo pip install qgis-plugin-ci --break-system-packages

- name: Package xlsform2qgis
- name: Package convert2qgis
run: |
pip wheel $(grep -o -P '(https://.*.tar.gz)' requirements.txt)
XLSFORM2QGIS_COMMIT_SHA=$(echo $(grep -o -P '((https://github\.com/opengisch/xlsform2qgis/.*.tar.gz))' requirements.txt) | grep -Eo '[0-9a-f]{40}')
mv xlsform2qgis-*.whl xlsformconverter/xlsform2qgis_${XLSFORM2QGIS_COMMIT_SHA}.whl
CONVERT2QGIS_COMMIT_SHA=$(echo $(grep -o -P '((https://github\.com/opengisch/convert2qgis/.*.tar.gz))' requirements.txt) | grep -Eo '[0-9a-f]{40}')
mv convert2qgis-*.whl xlsformconverter/convert2qgis_${CONVERT2QGIS_COMMIT_SHA}.whl

- name: Release
run: |
XLSFORM2QGIS_COMMIT_SHA=$(echo $(grep -o -P '((https://github\.com/opengisch/xlsform2qgis/.*.tar.gz))' requirements.txt) | grep -Eo '[0-9a-f]{40}')
CONVERT2QGIS_COMMIT_SHA=$(echo $(grep -o -P '((https://github\.com/opengisch/convert2qgis/.*.tar.gz))' requirements.txt) | grep -Eo '[0-9a-f]{40}')
qgis-plugin-ci --no-validation package ${{ github.sha }} \
--asset-path xlsformconverter/xlsform2qgis_${XLSFORM2QGIS_COMMIT_SHA}.whl
--asset-path xlsformconverter/convert2qgis_${CONVERT2QGIS_COMMIT_SHA}.whl

- name: Unzip
run: |
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
__pycache__
xlsform2qgis*
xlsformconverter.*.zip

1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,3 @@ To develop locally this plugin, checkout [`XLSFormConverter`](https://github.com
1. Checkout the [`XLSFormConverter`](https://github.com/opengisch/XLSFormConverter/) by executing `git clone git@github.com:opengisch/XLSFormConverter.git`.

2. Checkout the [`xlsform2qgis`](https://github.com/opengisch/xlsform2qgis/) by following the `README.md` instructions from the respective repository. Ensure you install `xlsform2qgis` as locally editable module, as per documentation.

4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# NOTE `xlsform2qgis` version should be defined in the `*.tar.gz` format, not `git+https://` to make `wheel` happy
xlsform2qgis @ https://github.com/opengisch/xlsform2qgis/archive/7fd7d726cab6636bfb650d1fcd9e1b8c2cc589af.tar.gz
# NOTE `convert2qgis` version should be defined in the `*.tar.gz` format, not `git+https://` to make `wheel` happy
convert2qgis @ https://github.com/opengisch/convert2qgis/archive/6e9e16d3fe2a2087dbe69c3554e93572b4e55fdb.tar.gz
298 changes: 0 additions & 298 deletions xlsformconverter/XLSFormConverterAlgorithms.py

This file was deleted.

Loading
Loading