Merge pull request #80 from PUTvision/rename_directories

Renamed 'plugin' directory to 'src'.
PUTvision · Jan 21, 2023 · df37d65 · df37d65
2 parents 2b2239c + 67fec16
commit df37d65
Show file tree

Hide file tree

Showing 53 changed files with 8 additions and 120 deletions.
diff --git a/.github/workflows/python-app-ubuntu.yml b/.github/workflows/python-app-ubuntu.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Prepare directory for packing with zip
       run: |
         mkdir -p out/deepness
-        cp -r plugin/deepness/ out/deepness/deepness
+        cp -r src/deepness/ out/deepness/deepness
     - name: Update
       run: |
         sudo apt update
@@ -44,13 +44,13 @@ jobs:
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names
-        python3 -m flake8 plugin/deepness/ --count --select=E9,F63,F7,F82 --show-source --statistics
+        python3 -m flake8 src/deepness/ --count --select=E9,F63,F7,F82 --show-source --statistics
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        python3 -m flake8 plugin/deepness/ --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+        python3 -m flake8 src/deepness/ --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
     - name: Test with pytest
       run: |
         export PYTHONPATH="/usr/lib/python3/dist-packages":PYTHONPATH && echo "import qgis" | python3
-        export PYTHONPATH="$PYTHONPATH:$(pwd)/plugin"
+        export PYTHONPATH="$PYTHONPATH:$(pwd)/src"
         export PYTHONPATH="$PYTHONPATH:$(pwd)"
         
         # apparently there is some issue with opencv-python-headless, we need to reinstall it 
@@ -62,7 +62,7 @@ jobs:
         xvfb-run python3 test/test_map_processor_segmentation.py
         
         # run the actual tests
-        xvfb-run python3 -m pytest --cov=plugin/deepness/ --cov-report html test/
+        xvfb-run python3 -m pytest --cov=src/deepness/ --cov-report html test/
     - name: 'Upload Artifact - test coverage'
       uses: actions/upload-artifact@v3
       with:

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-  <img width="250" height="250" src="plugin/deepness/images/icon.png" alt="dsf_logo">
+  <img width="250" height="250" src="src/deepness/images/icon.png" alt="dsf_logo">
 
   <h2 align="center">Deepness: Deep Neural Remote Sensing QGIS Plugin</h2>
 </p>
@@ -40,7 +40,7 @@ python3 -m venv venv --system-site-packages
 - Create a symlink to our plugin in a QGIS plugin directory:
 
 ```bash
-ln -s $PROJECT_DIR/plugin/deepness ~/.local/share/QGIS/QGIS3/profiles/default/python/plugins/deepness
+ln -s $PROJECT_DIR/src/deepness ~/.local/share/QGIS/QGIS3/profiles/default/python/plugins/deepness
 ```
 
 - Activate the environment and install requirements:

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -152,7 +152,7 @@
 set_type_checking_flag = True  # Enable 'expensive' imports for sphinx_autodoc_typehints
 nbsphinx_allow_errors = True  # Continue through Jupyter errors
 add_module_names = False # Remove namespaces from class/method signatures
-html_logo = "../../plugin/deepness/images/icon.png"
+html_logo = "../../src/deepness/images/icon.png"
 html_theme_options = {
     'logo_only': False,
     'display_version': True,

diff --git a/plugin_upload.py b/plugin_upload.py
diff --git a/plugin/__init__.py → src/__init__.py b/plugin/__init__.py → src/__init__.py
diff --git a/plugin/deepness/README.md → src/deepness/README.md b/plugin/deepness/README.md → src/deepness/README.md
diff --git a/plugin/deepness/__init__.py → src/deepness/__init__.py b/plugin/deepness/__init__.py → src/deepness/__init__.py
diff --git a/plugin/deepness/common/__init__.py → src/deepness/common/__init__.py b/plugin/deepness/common/__init__.py → src/deepness/common/__init__.py
diff --git a/plugin/deepness/common/channels_mapping.py → src/deepness/common/channels_mapping.py b/plugin/deepness/common/channels_mapping.py → src/deepness/common/channels_mapping.py
diff --git a/plugin/deepness/common/config_entry_key.py → src/deepness/common/config_entry_key.py b/plugin/deepness/common/config_entry_key.py → src/deepness/common/config_entry_key.py
diff --git a/plugin/deepness/common/defines.py → src/deepness/common/defines.py b/plugin/deepness/common/defines.py → src/deepness/common/defines.py
diff --git a/plugin/deepness/common/errors.py → src/deepness/common/errors.py b/plugin/deepness/common/errors.py → src/deepness/common/errors.py
diff --git a/...in/deepness/common/lazy_package_loader.py → src/deepness/common/lazy_package_loader.py b/...in/deepness/common/lazy_package_loader.py → src/deepness/common/lazy_package_loader.py
diff --git a/plugin/deepness/common/misc.py → src/deepness/common/misc.py b/plugin/deepness/common/misc.py → src/deepness/common/misc.py
diff --git a/.../common/processing_parameters/__init__.py → .../common/processing_parameters/__init__.py b/.../common/processing_parameters/__init__.py → .../common/processing_parameters/__init__.py
diff --git a/...essing_parameters/detection_parameters.py → ...essing_parameters/detection_parameters.py b/...essing_parameters/detection_parameters.py → ...essing_parameters/detection_parameters.py
diff --git a/...g_parameters/map_processing_parameters.py → ...g_parameters/map_processing_parameters.py b/...g_parameters/map_processing_parameters.py → ...g_parameters/map_processing_parameters.py
diff --git a/...ssing_parameters/regression_parameters.py → ...ssing_parameters/regression_parameters.py b/...ssing_parameters/regression_parameters.py → ...ssing_parameters/regression_parameters.py
diff --git a/...ing_parameters/segmentation_parameters.py → ...ing_parameters/segmentation_parameters.py b/...ing_parameters/segmentation_parameters.py → ...ing_parameters/segmentation_parameters.py
diff --git a/...meters/training_data_export_parameters.py → ...meters/training_data_export_parameters.py b/...meters/training_data_export_parameters.py → ...meters/training_data_export_parameters.py
diff --git a/plugin/deepness/deepness.py → src/deepness/deepness.py b/plugin/deepness/deepness.py → src/deepness/deepness.py
diff --git a/plugin/deepness/deepness_dockwidget.py → src/deepness/deepness_dockwidget.py b/plugin/deepness/deepness_dockwidget.py → src/deepness/deepness_dockwidget.py
diff --git a/plugin/deepness/deepness_dockwidget.ui → src/deepness/deepness_dockwidget.ui b/plugin/deepness/deepness_dockwidget.ui → src/deepness/deepness_dockwidget.ui
diff --git a/...es_installer/packages_installer_dialog.py → ...es_installer/packages_installer_dialog.py b/...es_installer/packages_installer_dialog.py → ...es_installer/packages_installer_dialog.py
diff --git a/...es_installer/packages_installer_dialog.ui → ...es_installer/packages_installer_dialog.ui b/...es_installer/packages_installer_dialog.ui → ...es_installer/packages_installer_dialog.ui
diff --git a/plugin/deepness/images/get_image_path.py → src/deepness/images/get_image_path.py b/plugin/deepness/images/get_image_path.py → src/deepness/images/get_image_path.py
diff --git a/plugin/deepness/images/icon.png → src/deepness/images/icon.png b/plugin/deepness/images/icon.png → src/deepness/images/icon.png
diff --git a/plugin/deepness/metadata.txt → src/deepness/metadata.txt b/plugin/deepness/metadata.txt → src/deepness/metadata.txt
diff --git a/plugin/deepness/processing/__init__.py → src/deepness/processing/__init__.py b/plugin/deepness/processing/__init__.py → src/deepness/processing/__init__.py
diff --git a/plugin/deepness/processing/extent_utils.py → src/deepness/processing/extent_utils.py b/plugin/deepness/processing/extent_utils.py → src/deepness/processing/extent_utils.py
diff --git a/...ness/processing/map_processor/__init__.py → ...ness/processing/map_processor/__init__.py b/...ness/processing/map_processor/__init__.py → ...ness/processing/map_processor/__init__.py
diff --git a/...ng/map_processor/map_processing_result.py → ...ng/map_processor/map_processing_result.py b/...ng/map_processor/map_processing_result.py → ...ng/map_processor/map_processing_result.py
diff --git a/...processing/map_processor/map_processor.py → ...processing/map_processor/map_processor.py b/...processing/map_processor/map_processor.py → ...processing/map_processor/map_processor.py
diff --git a/.../map_processor/map_processor_detection.py → .../map_processor/map_processor_detection.py b/.../map_processor/map_processor_detection.py → .../map_processor/map_processor_detection.py
diff --git a/...map_processor/map_processor_regression.py → ...map_processor/map_processor_regression.py b/...map_processor/map_processor_regression.py → ...map_processor/map_processor_regression.py
diff --git a/...p_processor/map_processor_segmentation.py → ...p_processor/map_processor_segmentation.py b/...p_processor/map_processor_segmentation.py → ...p_processor/map_processor_segmentation.py
diff --git a/...sor/map_processor_training_data_export.py → ...sor/map_processor_training_data_export.py b/...sor/map_processor_training_data_export.py → ...sor/map_processor_training_data_export.py
diff --git a/...map_processor/map_processor_with_model.py → ...map_processor/map_processor_with_model.py b/...map_processor/map_processor_with_model.py → ...map_processor/map_processor_with_model.py
diff --git a/...in/deepness/processing/models/__init__.py → src/deepness/processing/models/__init__.py b/...in/deepness/processing/models/__init__.py → src/deepness/processing/models/__init__.py
diff --git a/...in/deepness/processing/models/detector.py → src/deepness/processing/models/detector.py b/...in/deepness/processing/models/detector.py → src/deepness/processing/models/detector.py
diff --git a/.../deepness/processing/models/model_base.py → src/deepness/processing/models/model_base.py b/.../deepness/processing/models/model_base.py → src/deepness/processing/models/model_base.py
diff --git a/...deepness/processing/models/model_types.py → ...deepness/processing/models/model_types.py b/...deepness/processing/models/model_types.py → ...deepness/processing/models/model_types.py
diff --git a/...n/deepness/processing/models/regressor.py → src/deepness/processing/models/regressor.py b/...n/deepness/processing/models/regressor.py → src/deepness/processing/models/regressor.py
diff --git a/...n/deepness/processing/models/segmentor.py → src/deepness/processing/models/segmentor.py b/...n/deepness/processing/models/segmentor.py → src/deepness/processing/models/segmentor.py
diff --git a/...n/deepness/processing/processing_utils.py → src/deepness/processing/processing_utils.py b/...n/deepness/processing/processing_utils.py → src/deepness/processing/processing_utils.py
diff --git a/plugin/deepness/processing/tile_params.py → src/deepness/processing/tile_params.py b/plugin/deepness/processing/tile_params.py → src/deepness/processing/tile_params.py
diff --git a/plugin/deepness/resources.py → src/deepness/resources.py b/plugin/deepness/resources.py → src/deepness/resources.py
diff --git a/plugin/deepness/resources.qrc → src/deepness/resources.qrc b/plugin/deepness/resources.qrc → src/deepness/resources.qrc
diff --git a/plugin/deepness/widgets/__init__.py → src/deepness/widgets/__init__.py b/plugin/deepness/widgets/__init__.py → src/deepness/widgets/__init__.py
diff --git a/..._mapping/input_channels_mapping_widget.py → ..._mapping/input_channels_mapping_widget.py b/..._mapping/input_channels_mapping_widget.py → ..._mapping/input_channels_mapping_widget.py
diff --git a/..._mapping/input_channels_mapping_widget.ui → ..._mapping/input_channels_mapping_widget.ui b/..._mapping/input_channels_mapping_widget.ui → ..._mapping/input_channels_mapping_widget.ui
diff --git a/...ort_widget/training_data_export_widget.py → ...ort_widget/training_data_export_widget.py b/...ort_widget/training_data_export_widget.py → ...ort_widget/training_data_export_widget.py
diff --git a/...ort_widget/training_data_export_widget.ui → ...ort_widget/training_data_export_widget.ui b/...ort_widget/training_data_export_widget.ui → ...ort_widget/training_data_export_widget.ui