-
Notifications
You must be signed in to change notification settings - Fork 103
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Merge remote-tracking branch 'origin/develop'"
- Loading branch information
1 parent
3297dfa
commit b90e205
Showing
5,080 changed files
with
106,968 additions
and
811,823 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
# EditorConfig is awesome: http://EditorConfig.org | ||
|
||
# top-most EditorConfig file | ||
root = true | ||
|
||
# Unix-style newlines with a newline ending every file | ||
[*] | ||
charset = utf-8 | ||
indent_style = space | ||
end_of_line = lf | ||
insert_final_newline = true | ||
|
||
# 4 space indentation | ||
[*.py] | ||
indent_style = space | ||
indent_size = 4 | ||
|
||
# Tab indentation (no size specified) | ||
[Makefile] | ||
indent_style = tab | ||
|
||
# Indentation override for all JS under lib directory | ||
[*.js, *ts, *scss, *.css, *.html] | ||
indent_size = 2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,141 @@ | ||
*.*~ | ||
web/js/config.js | ||
web/js/configmap.js | ||
config/databases.yml | ||
config/settings.ini | ||
wms/wms*.map | ||
apache/*.conf | ||
settings.ini | ||
config/geonature_config.toml | ||
|
||
**/conf_gn_module.toml | ||
|
||
log/* | ||
cache/* | ||
lib/sfGeonatureConfig.php | ||
.vscode/ | ||
/backend/venv/* | ||
geonature_config.toml | ||
external_assets/ | ||
external_modules/* | ||
tmp/ | ||
var/ | ||
data/migrations/v1tov2/v1_compat.ini | ||
data/migrations/v1tov2/v1_compat.log | ||
|
||
config.py | ||
backend/static/medias/* | ||
backend/static/shapefiles/* | ||
backend/static/configs/* | ||
backend/run.py | ||
|
||
.vscode | ||
|
||
*.perm | ||
*.pem | ||
|
||
# Byte-compiled / optimized / DLL files | ||
__pycache__/ | ||
*.py[cod] | ||
*$py.class | ||
|
||
# C extensions | ||
*.so | ||
|
||
# Distribution / packaging | ||
.Python | ||
env/ | ||
build/ | ||
develop-eggs/ | ||
dist/ | ||
downloads/ | ||
eggs/ | ||
.eggs/ | ||
lib/ | ||
lib64/ | ||
parts/ | ||
sdist/ | ||
var/ | ||
wheels/ | ||
*.egg-info/ | ||
.installed.cfg | ||
*.egg | ||
.pytest_cache | ||
|
||
# PyInstaller | ||
# Usually these files are written by a python script from a template | ||
# before PyInstaller builds the exe, so as to inject date/other infos into it. | ||
*.manifest | ||
*.spec | ||
|
||
# Installer logs | ||
pip-log.txt | ||
pip-delete-this-directory.txt | ||
|
||
# Unit test / coverage reports | ||
htmlcov/ | ||
.tox/ | ||
.coverage | ||
.coverage.* | ||
.cache | ||
.mypy_cache | ||
nosetests.xml | ||
coverage.xml | ||
*.cover | ||
.hypothesis/ | ||
|
||
# Translations | ||
*.mo | ||
*.pot | ||
|
||
# Django stuff: | ||
*.log | ||
local_settings.py | ||
|
||
# Flask stuff: | ||
instance/ | ||
.webassets-cache | ||
|
||
# Scrapy stuff: | ||
.scrapy | ||
|
||
# Sphinx documentation | ||
docs/_build/ | ||
|
||
# PyBuilder | ||
target/ | ||
|
||
# Jupyter Notebook | ||
.ipynb_checkpoints | ||
|
||
# pyenv | ||
.python-version | ||
|
||
# celery beat schedule file | ||
celerybeat-schedule | ||
|
||
# SageMath parsed files | ||
*.sage.py | ||
|
||
# dotenv | ||
.env | ||
|
||
# virtualenv | ||
.venv | ||
venv/ | ||
ENV/ | ||
|
||
# Spyder project settings | ||
.spyderproject | ||
.spyproject | ||
|
||
# Rope project settings | ||
.ropeproject | ||
|
||
# mkdocs documentation | ||
/site | ||
|
||
# mypy | ||
.mypy_cache/ | ||
|
||
*.pid | ||
package-lock.json | ||
*.orig | ||
|
||
|
||
install_all/install_all.log | ||
|
||
# Pycharm | ||
.idea/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
language: python | ||
|
||
python: | ||
- "3.5" | ||
|
||
|
||
before_install: | ||
- sudo apt-get install -y libgdal1-dev libgdal-dev | ||
- sudo apt-get install -y python-gdal | ||
|
||
# install dependencies | ||
install: | ||
- cd backend | ||
- pip install -r requirements-travis.txt | ||
- cd tests/travis_test | ||
- ./travis_test.sh | ||
- cd ../../ | ||
|
||
script: | ||
- pytest | ||
|
||
notifications: | ||
email: | ||
recipients: | ||
- [email protected] | ||
on_failure: always | ||
on_success: never |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.