diff --git a/.gitignore b/.gitignore index fb4463f0..c61f960e 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ target/ .python-version coverage.* example.sqlite +docker-compose.override.yml +compose.override.yml diff --git a/compose.overrides.yml b/compose.overrides.yml deleted file mode 100644 index dd68b392..00000000 --- a/compose.overrides.yml +++ /dev/null @@ -1,59 +0,0 @@ -services: - db: - restart: always - image: postgres:12.3 - environment: - POSTGRES_HOST_AUTH_METHOD: trust - POSTGRES_USER: "postgres" - POSTGRES_PASSWORD: "postgres" - POSTGRES_DB: "esmerald" - expose: - - "5432" - volumes: - - "esmerald:/var/lib/postgresql/data" - command: >- - --jit=false - ports: - - "5432:5432" - - redis: - restart: always - image: redis:latest - ports: - - "6379:6379" - expose: - - "6379" - - mongodb: - restart: always - image: mongo:latest - container_name: mongo - environment: - MONGO_INITDB_ROOT_USERNAME: root - MONGO_INITDB_ROOT_PASSWORD: mongoadmin - MONGO_INITDB_DATABASE: mongodb - volumes: - - "mongo_esmerald_db_data:/data/db" - expose: - - 27017 - ports: - - 27017:27017 - - mongo-express: - image: mongo-express - restart: always - ports: - - 8081:8081 - environment: - ME_CONFIG_MONGODB_ENABLE_ADMIN: 'true' - ME_CONFIG_MONGODB_SERVER: mongodb - ME_CONFIG_MONGODB_ADMINUSERNAME: root - ME_CONFIG_MONGODB_ADMINPASSWORD: mongoadmin - ME_CONFIG_BASICAUTH_USERNAME: admin - ME_CONFIG_BASICAUTH_PASSWORD: password - -volumes: - esmerald: - external: true - mongo_esmerald_db_data: - external: true diff --git a/compose.yml b/compose.yml index fbb3b7c5..cee28c0b 100644 --- a/compose.yml +++ b/compose.yml @@ -14,14 +14,6 @@ services: ports: - "5432:5432" - redis: - restart: always - image: redis:latest - ports: - - "6379:6379" - expose: - - "6379" - mongodb: restart: always image: mongo:latest diff --git a/pyproject.toml b/pyproject.toml index 891d02d8..d0eb5beb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -134,7 +134,6 @@ dependencies = [ build = "mkdocs build" serve = "mkdocs serve --dev-addr localhost:8000" - [tool.hatch.envs.test] dependencies = [ "pytest>=7.1.3,<9.0.0", @@ -167,7 +166,6 @@ dependencies = [ ] [tool.hatch.envs.test.scripts] - # needs docker services running test = "ESMERALD_SETTINGS_MODULE='tests.settings.TestSettings' pytest {args}" coverage = "ESMERALD_SETTINGS_MODULE='tests.settings.TestSettings' pytest --cov=asyncz --cov=tests --cov-report=term-missing:skip-covered --cov-report=html tests {args}"