add setup.py & tox.ini, files reorganisation

Author: bouttier

.gitignore

@@ -54,3 +54,8 @@ data/ref/territoire.shx
 .idea/
 
 .vscode
+
+.coverage
+.tox
+*.swp
+*.swo

MANIFEST.in

@@ -0,0 +1,5 @@
+include VERSION
+include README.txt
+include LICENCE.txt
+include requirements.in
+include tox.ini

initAtlas.py renamed to atlas/app.py

@@ -47,7 +47,7 @@ def create_app():
     # configuration publique
     valid_config = read_and_validate_conf(config, AtlasConfig)
 
-    app = Flask(__name__, template_folder=APP_DIR)
+    app = Flask(__name__, template_folder='../' + APP_DIR)
     # push the config in app config at 'PUBLIC' key
     app.config.update(valid_config)
 
@@ -77,9 +77,9 @@ def pretty(val):
     return app
 
 
-app = create_app()
 if __name__ == "__main__":
     # validation de la configuration secrète
+    app = create_app()
     secret_conf = read_and_validate_conf(config, SecretSchemaConf)
     app.run(
         host="0.0.0.0", port=secret_conf["GUNICORN_PORT"], debug=app.config["modeDebug"]

atlas/configuration/config.py.example

@@ -107,7 +107,7 @@ AFFICHAGE_EN_CE_MOMENT = True
 
 AFFICHAGE_RANG_STAT = True
 COLONNES_RANG_STAT = 3
-RANG_STAT = [{'phylum': ["Arthropoda", "Mollusca", "Annelida", "Cnidaria", "Platyhelminthes"]]}, {'phylum': ["Chordata"]}, {'regne': ["Plantae"]}]
+RANG_STAT = [{'phylum': ["Arthropoda", "Mollusca", "Annelida", "Cnidaria", "Platyhelminthes"]}, {'phylum': ["Chordata"]}, {'regne': ["Plantae"]}]
 RANG_STAT_FR = ['Faune invertébrée', 'Faune vertébrée', 'Flore']
 
 

gunicorn_start.sh

@@ -16,4 +16,4 @@ export PYTHONPATH=$FLASKDIR:$PYTHONPATH
 
 
 # Start your unicorn
-exec gunicorn initAtlas:app --error-log $FLASKDIR/log/errors_atlas.log --pid="${app_name}.pid" -w "${gun_num_workers}"  -b "${gun_host}:${gun_port}"  -n "${app_name}"
+exec gunicorn "atlas.app:create_app()" --error-log $FLASKDIR/log/errors_atlas.log --pid="${app_name}.pid" -w "${gun_num_workers}"  -b "${gun_host}:${gun_port}"  -n "${app_name}"

requirements.in

@@ -0,0 +1,18 @@
+Click
+dominate
+Flask-Compress
+Flask-Script
+Flask-SQLAlchemy
+Flask<2
+GeoAlchemy2
+geojson
+gunicorn
+itsdangerous
+Jinja2
+MarkupSafe
+marshmallow
+psycopg2
+SQLAlchemy
+visitor
+Werkzeug
+

setup.py

@@ -0,0 +1,32 @@
+import setuptools
+from pathlib import Path
+
+root_dir = Path(__file__).absolute().parent
+with (root_dir / 'VERSION').open() as f:
+    version = f.read()
+with (root_dir / 'README.rst').open() as f:
+    long_description = f.read()
+with (root_dir / 'requirements.in').open() as f:
+    requirements = f.read().splitlines()
+
+
+setuptools.setup(
+    name='geonature-atlas',
+    version=version,
+    description="Atlas WEB dynamique Faune-Flore basé sur les données présentes dans la synthèse de GeoNature",
+    long_description=long_description,
+    long_description_content_type='text/x-rst',
+    maintainer='Parcs nationaux des Écrins et des Cévennes',
+    maintainer_email='[email protected]',
+    url='https://github.com/PnX-SI/GeoNature-Atlas',
+    packages=setuptools.find_packages('.'),
+    #package_dir={'': 'src'},
+    install_requires=requirements,
+    classifiers=['Development Status :: 1 - Planning',
+                 'Intended Audience :: Developers',
+                 'Natural Language :: English',
+                 'Programming Language :: Python :: 3',
+                 'License :: OSI Approved :: GNU General Public License v3',
+                 'Operating System :: OS Independent'],
+)
+

tests/conftest.py

@@ -1,12 +1,16 @@
 # pylint: disable=redefined-outer-name
 import pytest
 
-from initAtlas import app as flask_app
+from atlas.app import create_app
 
-@pytest.fixture
+@pytest.fixture(scope='session')
 def app():
-    yield flask_app
+    app = create_app()
+    app.testing = True
+    app.config['SERVER_NAME'] = 'test.atlas.local'  # required by url_for
+    with app.app_context():
+        yield app
 
 @pytest.fixture
 def client(app):
-    return app.test_client()    
+    return app.test_client()

tox.ini

@@ -0,0 +1,16 @@
+[tox]
+envlist = clean,py37
+
+[testenv]
+deps =
+    -r requirements.txt
+    pytest
+    pytest-cov
+    pytest-flask
+commands =
+    pytest --cov=atlas
+
+[testenv:clean]
+deps = coverage
+skip_install = true
+commands = coverage erase