Skip to content

Commit 2c73b0a

Browse files
authored
Merge pull request #5 from phborba/dev
Bug fix and new feats
2 parents 62f883c + a7688b0 commit 2c73b0a

File tree

92 files changed

+2628
-279
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+2628
-279
lines changed

.dev/setup_dev_linux.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/env bash
2+
3+
ln -s ${PWD}/../DeepLearningTools ~/.local/share/QGIS/QGIS3/profiles/default/python/plugins/DeepLearningTools

.dev/setup_dev_macos.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/env bash
2+
3+
ln -s ${PWD}/../DeepLearningTools ~/Library/Application\ Support/QGIS/QGIS3/profiles/default/python/plugins/DeepLearningTools

.docker/docker-compose.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
version: '3'
2+
3+
services:
4+
qgis:
5+
image: qgis/qgis:release-3_18
6+
container_name: deeplearningtools-testing-env
7+
volumes:
8+
# - /tmp/.X11-unix:/tmp/.X11-unix
9+
- ../DeepLearningTools:/tests_directory/DeepLearningTools
10+
environment:
11+
# - DISPLAY=unix$DISPLAY
12+
- DISPLAY=:99

.docker/exec.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/env bash
2+
3+
docker exec -t deeplearningtools-testing-env sh -c "cd /tests_directory && qgis_testrunner.sh tests.test_image_processing"

.docker/start.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/env bash
2+
3+
docker-compose up -d --build
4+
echo 'Wait 10 seconds'
5+
sleep 10
6+
echo 'Installation of the plugin'
7+
docker exec -t deeplearningtools-testing-env sh -c "qgis_setup.sh DeepLearningTools"
8+
echo 'Containers are running'

.docker/stop.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/usr/bin/env bash
2+
3+
echo 'Stopping/killing containers'
4+
docker-compose kill
5+
docker-compose rm -f

.github/workflows/release.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
on:
2+
release:
3+
types: published
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- uses: actions/checkout@v2
11+
12+
- name: Set up Python 3.8
13+
uses: actions/setup-python@v1
14+
with:
15+
python-version: 3.8
16+
17+
- name: Install qgis-plugin-ci
18+
run: pip3 install qgis-plugin-ci
19+
20+
- name: Deploy plugin
21+
run: >-
22+
qgis-plugin-ci
23+
release ${GITHUB_REF/refs\/tags\//}
24+
--github-token ${{ secrets.GITHUB_TOKEN }}
25+
--osgeo-username ${{ secrets.OSGEO_USER }}
26+
--osgeo-password ${{ secrets.OSGEO_PASSWORD }}
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Tests 🎳
2+
3+
on:
4+
push:
5+
6+
pull_request:
7+
8+
9+
jobs:
10+
test-desktop:
11+
runs-on: ubuntu-latest
12+
defaults:
13+
run:
14+
working-directory: .docker
15+
steps:
16+
- name: Check out repository
17+
uses: actions/checkout@v2
18+
with:
19+
submodules: 'true'
20+
- name: Pull docker images
21+
run: docker-compose pull
22+
- uses: satackey/action-docker-layer-caching@v0.0.11
23+
continue-on-error: true
24+
- name: Start the environment
25+
run: ./start.sh
26+
- name: Tests
27+
run: ./exec.sh
28+
- name: Stop the environment
29+
run: docker-compose down

.qgis-plugin-ci

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
plugin_path: DeepLearningTools
2+
github_organization_slug: phborba
3+
project_slug: DeepLearningTools

.travis.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)