Skip to content

Commit

Permalink
Merge pull request #170 from isogeo/master
Browse files Browse the repository at this point in the history
Start QGIS 3 dev
  • Loading branch information
Guts committed May 6, 2019
2 parents 4a6f675 + 59b02a4 commit b7fadff
Show file tree
Hide file tree
Showing 252 changed files with 66,706 additions and 18,891 deletions.
23 changes: 22 additions & 1 deletion .gitignore
Expand Up @@ -91,6 +91,28 @@ ENV/

### CUSTOM

# windaube
desktop.ini

# sphinx
docs/_*
env*/*

# isogeo api
client_secrets.json
_auth/

# logs
_logs/
*.log

# tests fixtures
test/fixtures

# user settings
_user/


*.pyc
*.*~
scripts/
Expand All @@ -99,4 +121,3 @@ help/
.idea
.coverage
.noseids
*.log
58 changes: 58 additions & 0 deletions .travis.yml
@@ -0,0 +1,58 @@
language: python
dist: trusty

python:
- "2.7"

virtualenv:
system_site_packages: true

cache:
apt: true
pip: true

branches:
only:
- master

git:
depth: 20

addons:
apt:
update: true
sources:
- sourceline: 'deb https://qgis.org/ubuntu-ltr/ trusty main'
packages:
- python-software-properties
- qgis
- python-qgis
- pyqt4-dev-tools

before_script:
- echo "Build starting on " `date`
- export QGIS_PREFIX_PATH=/usr
- export PYTHONPATH=${QGIS_PREFIX_PATH}/share/qgis/python/:${QGIS_PREFIX_PATH}/share/qgis/python/plugins:`pwd`
- echo "PYTHONPATH:" $PYTHONPATH
- export LD_LIBRARY_PATH=${QGIS_PREFIX_PATH}/lib

script:
# translations
- pylupdate4 -noobsolete -verbose isogeo_search_engine.pro
# ui compile
- pyuic4 -x "ui/isogeo_dockwidget_base.ui" -o "ui/.ui_isogeo.py"
- pyuic4 -x "ui/auth/ui_authentication.ui" -o "ui/auth/ui_authentication.py"
- pyuic4 -x "ui/credits/ui_credits.ui" -o "ui/credits/ui_credits.py"
- pyuic4 -x "ui/metadata/ui_md_details.ui" -o "ui/metadata/ui_md_details.py"
- pyuic4 -x "ui/quicksearch/ui_quicksearch_rename.ui" -o "ui/quicksearch/ui_quicksearch_rename.py"
- pyuic4 -x "ui/quicksearch/ui_quicksearch_new.ui" -o "ui/quicksearch/ui_quicksearch_new.py"
# packaging
- python tools/plugin_packager.py

deploy:
provider: releases
api_key: ${GITHUB_API_KEY_TOKEN}
file: "build/latest/isogeo_search_engine.zip"
skip_cleanup: true
on:
tags: true
117 changes: 117 additions & 0 deletions .vscode/launch.json
@@ -0,0 +1,117 @@
{
// Utilisez IntelliSense pour en savoir plus sur les attributs possibles.
// Pointez pour afficher la description des attributs existants.
// Pour plus d'informations, visitez : https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [

{
"name": "Python: Current File",
"type": "python",
"request": "launch",
"program": "${file}"
},
{
"name": "Python: Attach",
"type": "python",
"request": "attach",
"localRoot": "${workspaceFolder}",
"remoteRoot": "${workspaceFolder}",
"port": 3000,
"secret": "my_secret",
"host": "localhost"
},
{
"name": "Python: Terminal (integrated)",
"type": "python",
"request": "launch",
"program": "${file}",
"console": "integratedTerminal"
},
{
"name": "Python: Terminal (external)",
"type": "python",
"request": "launch",
"program": "${file}",
"console": "externalTerminal"
},
{
"name": "Python: Django",
"type": "python",
"request": "launch",
"program": "${workspaceFolder}/manage.py",
"args": [
"runserver",
"--noreload",
"--nothreading"
],
"debugOptions": [
"RedirectOutput",
"Django"
]
},
{
"name": "Python: Flask (0.11.x or later)",
"type": "python",
"request": "launch",
"module": "flask",
"env": {
"FLASK_APP": "app.py"
},
"args": [
"run",
"--no-debugger",
"--no-reload"
]
},
{
"name": "Python: Module",
"type": "python",
"request": "launch",
"module": "module.name"
},
{
"name": "Python: Pyramid",
"type": "python",
"request": "launch",
"args": [
"${workspaceFolder}/development.ini"
],
"debugOptions": [
"RedirectOutput",
"Pyramid"
]
},
{
"name": "Python: Watson",
"type": "python",
"request": "launch",
"program": "${workspaceFolder}/console.py",
"args": [
"dev",
"runserver",
"--noreload=True"
]
},
{
"name": "Python: All debug Options",
"type": "python",
"request": "launch",
"pythonPath": "${config:python.pythonPath}",
"program": "${file}",
"module": "module.name",
"env": {
"VAR1": "1",
"VAR2": "2"
},
"envFile": "${workspaceFolder}/.env",
"args": [
"arg1",
"arg2"
],
"debugOptions": [
"RedirectOutput"
]
}
]
}
5 changes: 5 additions & 0 deletions .vscode/pyqgis2.env
@@ -0,0 +1,5 @@
# dev.env - development configuration
OSGEO4W_ROOT=C:/OSGeo4W64
QT_PLUGIN_PATH=C:/OSGeo4W64/apps/qgis-ltr/qtplugins;C:/OSGeo4W64/apps/qt4/plugins
PYTHONHOME=C:/OSGeo4W64/apps/Python27
PYTHONPATH=C:/OSGeo4W64/bin/python.exe;C:/OSGeo4W64/apps/qgis-ltr/python;
9 changes: 9 additions & 0 deletions .vscode/settings.json
@@ -0,0 +1,9 @@
{
"python.jediEnabled": true,
"pyqt-integration.qtdesigner.path": "C:/OSGeo4W64/bin//designer.exe",
"pyqt-integration.pyuic.cmd": "pyuic4",
"pyqt-integration.pyrcc.cmd": "pyrcc4",
"pyqt-integration.pyrcc.compile.filepath": "${workspace}/${qrc_name}.py",
"python.linting.enabled": true,
"python.pythonPath": "C:\\Users\\julien.moura\\.virtualenvs\\isogeo_search_engine_dev-d762mfF6\\Scripts\\python.exe"
}
2 changes: 1 addition & 1 deletion ISSUE_TEMPLATE.md
Expand Up @@ -6,7 +6,7 @@ Fichier log : **\\\ JOINDRE LE FICHIER LOG // [Voir ici pour le récupérer](htt

## Environnement

* Version de QGIS : **2.18.14**
* Version de QGIS : **2.18.x**
* Installation de QGIS : **installateur indépendant ou installateur réseau OSGeo4W.**
* Système d'exploitation : **Windows 7/Vista/10 MAc OS X Debian 8**
* Architecture processeur : **32 / 64 bits**
Expand Down
14 changes: 14 additions & 0 deletions Pipfile
@@ -0,0 +1,14 @@
[[source]]
url = "https://pypi.org/simple"
verify_ssl = true
name = "pypi"

[dev-packages]
"pb_tool" = "*"

[packages]
isogeo-pysdk = "*"
"pathlib2" = "*"

[requires]
python_version = "2.7"

0 comments on commit b7fadff

Please sign in to comment.