Merge pull request #3925 from camptocamp/no-venv

Removes the venv

Makefile

@@ -153,18 +153,16 @@ geoportal/tests/functional/alembic.yaml: $(BUILD_DIR)/c2ctemplate-cache.json
 docker/test-db/12-alembic.sql: \
 		geoportal/tests/functional/alembic.ini \
 		geoportal/tests/functional/alembic.yaml \
-		$(shell ls -1 commons/c2cgeoportal_commons/alembic/main/*.py) \
-		$(BUILD_DIR)/commons.timestamp
+		$(shell ls -1 commons/c2cgeoportal_commons/alembic/main/*.py)
 	$(PRERULE_CMD)
-	$(BUILD_DIR)/venv/bin/python /usr/local/bin/alembic --config=$< --name=main upgrade --sql head > $@
+	alembic --config=$< --name=main upgrade --sql head > $@
 
 docker/test-db/13-alembic-static.sql: \
 		geoportal/tests/functional/alembic.ini \
 		geoportal/tests/functional/alembic.yaml \
-		$(shell ls -1 commons/c2cgeoportal_commons/alembic/static/*.py) \
-		$(BUILD_DIR)/commons.timestamp
+		$(shell ls -1 commons/c2cgeoportal_commons/alembic/static/*.py)
 	$(PRERULE_CMD)
-	$(BUILD_DIR)/venv/bin/python /usr/local/bin/alembic --config=$< --name=static upgrade --sql head > $@
+	alembic --config=$< --name=static upgrade --sql head > $@
 
 docker-build-testdb: $(shell docker-required --path docker/test-db) \
 		docker/test-db/12-alembic.sql docker/test-db/13-alembic-static.sql \
@@ -242,10 +240,10 @@ flake8:
 
 .PHONY: pylint
 pylint: $(BUILD_DIR)/commons.timestamp
-	$(BUILD_DIR)/venv/bin/python /usr/local/bin/pylint --errors-only geoportal/c2cgeoportal_geoportal
-	$(BUILD_DIR)/venv/bin/python /usr/local/bin/pylint --errors-only geoportal/tests
 	pylint --errors-only commons/c2cgeoportal_commons
 	$(BUILD_DIR)/venv/bin/python /usr/local/bin/pylint --errors-only commons/acceptance_tests
+	$(BUILD_DIR)/venv/bin/python /usr/local/bin/pylint --errors-only geoportal/c2cgeoportal_geoportal
+	$(BUILD_DIR)/venv/bin/python /usr/local/bin/pylint --errors-only geoportal/tests
 	$(BUILD_DIR)/venv/bin/python /usr/local/bin/pylint --errors-only admin/c2cgeoportal_admin
 	$(BUILD_DIR)/venv/bin/python /usr/local/bin/pylint --errors-only admin/acceptance_tests
 

admin/c2cgeoportal_admin/__init__.py

@@ -6,7 +6,7 @@
 import c2cgeoform
 from pkg_resources import resource_filename
 
-from c2cgeoportal_commons.config import config as configuration
+from c2c.template.config import config as configuration
 from c2cgeoportal_admin.subscribers import add_renderer_globals, add_localizer
 
 

commons/acceptance_tests/conftest.py

@@ -10,7 +10,7 @@
 
 from c2cgeoportal_commons.testing.initializedb import init_db, truncate_tables
 from c2cgeoportal_commons.testing import get_engine, get_session_factory, get_tm_session, generate_mappers
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 
 @pytest.fixture(scope='session')

commons/c2cgeoportal_commons/__init__.py

@@ -3,7 +3,7 @@
 
 from pyramid.config import Configurator
 
-from c2cgeoportal_commons.config import config as configuration
+from c2c.template.config import config as configuration
 
 
 def includeme(config: Configurator) -> None:

commons/c2cgeoportal_commons/alembic/env.py

@@ -30,7 +30,7 @@
 from alembic import context
 from sqlalchemy import engine_from_config, pool
 from logging.config import fileConfig
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # Interpret the config file for Python logging.
 # This line sets up loggers basically.

commons/c2cgeoportal_commons/alembic/main/116b9b79fc4d_internal_and_external_layer_tables_.py

@@ -37,7 +37,7 @@
 from alembic import op
 from sqlalchemy import ForeignKey, Column
 from sqlalchemy.types import Integer, Boolean, Unicode
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = '116b9b79fc4d'

commons/c2cgeoportal_commons/alembic/main/164ac0819a61_add_image_format_to_wmts_layer.py

@@ -36,7 +36,7 @@
 
 from alembic import op
 from sqlalchemy import Column, Unicode
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = '164ac0819a61'

commons/c2cgeoportal_commons/alembic/main/166ff2dcc48d_create_database.py

@@ -40,7 +40,7 @@
 from sqlalchemy import ForeignKey, Column, Table, MetaData
 from sqlalchemy.types import Integer, Boolean, Unicode, String, Float, \
     UserDefinedType, DateTime
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = '166ff2dcc48d'

commons/c2cgeoportal_commons/alembic/main/1d5d4abfebd1_add_restricted_theme.py

@@ -35,7 +35,7 @@
 from alembic import op
 from sqlalchemy import Column, ForeignKey
 from sqlalchemy.types import Integer, Boolean
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = '1d5d4abfebd1'

commons/c2cgeoportal_commons/alembic/main/20137477bd02_update_icons_url.py

@@ -35,7 +35,7 @@
 """
 
 from alembic import op
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = '20137477bd02'

commons/c2cgeoportal_commons/alembic/main/21f11066f8ec_trigger_on_role_updates_user_in_static.py

@@ -35,7 +35,7 @@
 """
 
 from alembic import op
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = '21f11066f8ec'

commons/c2cgeoportal_commons/alembic/main/22e6dfb556de_add_description_tree_.py

@@ -36,7 +36,7 @@
 
 from alembic import op
 from sqlalchemy import Column, Unicode
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = '22e6dfb556de'

commons/c2cgeoportal_commons/alembic/main/2b8ed8c1df94_set_layergroup_treeitem_is_as_a_primary_.py

@@ -35,7 +35,7 @@
 """
 
 from alembic import op
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = '2b8ed8c1df94'

commons/c2cgeoportal_commons/alembic/main/32527659d57b_move_exclude_properties_from_layerv1_to_.py

@@ -37,7 +37,7 @@
 from alembic import op
 from sqlalchemy import Column
 from sqlalchemy.types import Unicode
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = '32527659d57b'

commons/c2cgeoportal_commons/alembic/main/415746eb9f6_changes_for_v2.py

@@ -37,7 +37,7 @@
 from alembic import op
 from sqlalchemy import Column, ForeignKey, Table, MetaData
 from sqlalchemy.types import Integer, Boolean, Unicode, Float
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = '415746eb9f6'

commons/c2cgeoportal_commons/alembic/main/5109242131ce_add_column_time_widget.py

@@ -37,7 +37,7 @@
 from alembic import op
 from sqlalchemy import Column
 from sqlalchemy.types import Unicode
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = '5109242131ce'

commons/c2cgeoportal_commons/alembic/main/53ba1a68d5fe_add_theme_to_fulltextsearch.py

@@ -36,7 +36,7 @@
 
 from alembic import op
 from sqlalchemy import Column, Integer, ForeignKey, Boolean, String
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = '53ba1a68d5fe'

commons/c2cgeoportal_commons/alembic/main/54645a535ad6_add_ordering_in_relation.py

@@ -37,7 +37,7 @@
 from alembic import op
 from sqlalchemy import Column
 from sqlalchemy.types import Integer
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = '54645a535ad6'

commons/c2cgeoportal_commons/alembic/main/596ba21e3833_separate_local_internal.py

@@ -35,7 +35,7 @@
 """
 
 from alembic import op
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = '596ba21e3833'

commons/c2cgeoportal_commons/alembic/main/6a412d9437b1_rename_serverogc_to_ogcserver.py

@@ -35,7 +35,7 @@
 """
 
 from alembic import op
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = '6a412d9437b1'

commons/c2cgeoportal_commons/alembic/main/6d87fdad275a_convert_metadata_to_the_right_case.py

@@ -35,7 +35,7 @@
 """
 
 from alembic import op
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = '6d87fdad275a'

commons/c2cgeoportal_commons/alembic/main/7d271f4527cd_add_layer_column_in_layerv1_table.py

@@ -37,7 +37,7 @@
 from alembic import op
 from sqlalchemy import Column
 from sqlalchemy.types import Unicode
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = '7d271f4527cd'

commons/c2cgeoportal_commons/alembic/main/8117bb9bba16_use_dimension_on_all_the_layers.py

@@ -35,7 +35,7 @@
 """
 
 from alembic import op
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = '8117bb9bba16'

commons/c2cgeoportal_commons/alembic/main/9268a1dffac0_add_trigger_to_be_able_to_correctly_.py

@@ -35,7 +35,7 @@
 """
 
 from alembic import op
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = '9268a1dffac0'

commons/c2cgeoportal_commons/alembic/main/951ff84bd8ec_be_able_to_delete_a_wms_layer_in_sql.py

@@ -35,7 +35,7 @@
 """
 
 from alembic import op
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = '951ff84bd8ec'

commons/c2cgeoportal_commons/alembic/main/b60f2a505f42_remame_uimetadata_to_metadata.py

@@ -35,7 +35,7 @@
 """
 
 from alembic import op
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = 'b60f2a505f42'

commons/c2cgeoportal_commons/alembic/main/d48a63b348f1_change_mapserver_url_for_docker.py

@@ -35,7 +35,7 @@
 """
 
 from alembic import op
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = 'd48a63b348f1'

commons/c2cgeoportal_commons/alembic/main/d8ef99bc227e_be_able_to_delete_a_linked_functionality.py

@@ -36,7 +36,7 @@
 
 from alembic import op
 import psycopg2
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = 'd8ef99bc227e'

commons/c2cgeoportal_commons/alembic/main/e004f76e951a_add_missing_not_null.py

@@ -35,7 +35,7 @@
 """
 
 from alembic import op
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = 'e004f76e951a'

commons/c2cgeoportal_commons/alembic/main/e7e03dedade3_put_the_default_wms_server_in_the_.py

@@ -35,7 +35,7 @@
 """
 
 from alembic import op
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = 'e7e03dedade3'

commons/c2cgeoportal_commons/alembic/main/ec82a8906649_add_missing_on_delete_cascade_on_layer_.py

@@ -35,7 +35,7 @@
 """
 
 from alembic import op
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = 'ec82a8906649'

commons/c2cgeoportal_commons/alembic/main/ee25d267bf46_main_interface_desktop.py

@@ -35,7 +35,7 @@
 """
 
 from alembic import op
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = 'ee25d267bf46'

commons/c2cgeoportal_commons/alembic/script.py.mako

@@ -36,7 +36,7 @@ Create Date: ${create_date}
 """
 
 from alembic import op
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = ${repr(up_revision)}

commons/c2cgeoportal_commons/alembic/static/1857owc78a07_add_last_login_and_expiration_date.py

@@ -38,7 +38,7 @@
 
 from alembic import op
 from sqlalchemy import Boolean, Column, DateTime
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = '1857owc78a07'

commons/c2cgeoportal_commons/alembic/static/1da396a88908_move_user_table_to_static_schema.py

@@ -39,7 +39,7 @@
 from alembic import op
 from sqlalchemy import Column, ForeignKey
 from sqlalchemy.types import Integer, String, Unicode, Boolean
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = '1da396a88908'

commons/c2cgeoportal_commons/alembic/static/3f89a7d71a5e_alter_column_url_to_remove_limitation.py

@@ -37,7 +37,7 @@
 
 from alembic import op
 from sqlalchemy import types
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = '3f89a7d71a5e'

commons/c2cgeoportal_commons/alembic/static/53d671b17b20_add_timezone_on_datetime_fields.py

@@ -35,7 +35,7 @@
 """
 
 from alembic import op
-from c2cgeoportal_commons.config import config
+from c2c.template.config import config
 
 # revision identifiers, used by Alembic.
 revision = '53d671b17b20'