Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EWPP-0000: Drop Poetry support. #121

Merged
merged 1 commit into from
May 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 0 additions & 6 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@ services:
environment: &web-environment
- DOCUMENT_ROOT=/test/oe_editorial
- COMPOSERVER=--2
- POETRY_IDENTIFIER_SEQUENCE=NEXT_EUROPA_COUNTER
- POETRY_SERVICE_ENDPOINT=http://web:8080/build/poetry-mock/wsdl
- POETRY_SERVICE_USERNAME=admin
- POETRY_SERVICE_PASSWORD=admin
- POETRY_NOTIFICATION_USERNAME=admin
- POETRY_NOTIFICATION_PASSWORD=admin
mysql:
image: registry.fpfis.eu/fpfis/sql:percona-5.7
command: --innodb-log-file-size=1G --max_allowed_packet=1G --innodb-buffer-pool-size=512M --wait_timeout=3000 --net_write_timeout=3000 --log_error_verbosity=3
Expand Down
39 changes: 8 additions & 31 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,20 @@

This module provides editorial features for the OpenEuropa project.

## Development setup

You can build the development site by running the following steps:

* Install the Composer dependencies:

```bash
composer install
```
## Drupal 10 support.

A post command hook (`drupal:site-setup`) is triggered automatically after `composer install`.
It will make sure that the necessary symlinks are properly setup in the development site.
It will also perform token substitution in development configuration files such as `behat.yml.dist`.
Support for Drupal 10 will be added only in 2.x releases.

* Install test site by running:
## Upgrading from 1.x to 2.x

```bash
./vendor/bin/run drupal:site-install
```
In 2.x, the support to Poetry has been dropped. In order to upgrade from 1.x to 2.x:

Your test site will be available at `./build`.
- uninstall `oe_editorial_corporate_workflow_translation_poetry`;
- upgrade to a 2.x release.

**Please note:** project files and directories are symlinked within the test site by using the
[OpenEuropa Task Runner's Drupal project symlink](https://github.com/openeuropa/task-runner-drupal-project-symlink) command.

If you add a new file or directory in the root of the project, you need to re-run `drupal:site-setup` in order to make
sure they are be correctly symlinked.

If you don't want to re-run a full site setup for that, you can simply run:

```
$ ./vendor/bin/run drupal:symlink-project
```

### Using Docker Compose
## Development setup

Alternatively, you can build a development site using [Docker](https://www.docker.com/get-docker) and
You can build a development site using [Docker](https://www.docker.com/get-docker) and
[Docker Compose](https://docs.docker.com/compose/) with the provided configuration.

Docker provides the necessary services and tools such as a web server and a database server to get the site running,
Expand Down
4 changes: 1 addition & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"drupal/entity_version": "^1.1",
"drupal/token": "^1.10",
"drush/drush": "^11.1",
"ec-europa/oe-poetry-client": "dev-master",
"guzzlehttp/guzzle": "^7.0",
"instaclick/php-webdriver": "^1.4.7",
"masterminds/html5": "^2.7.6",
Expand Down Expand Up @@ -67,8 +66,7 @@
"autoload-dev": {
"psr-4": {
"Drupal\\Tests\\oe_editorial\\": "./tests/src",
"Drupal\\Tests\\oe_translation\\": "./build/modules/contrib/oe_translation/tests/src",
"Drupal\\Tests\\oe_translation_poetry\\": "./build/modules/contrib/oe_translation/modules/oe_translation_poetry/tests/src"
"Drupal\\Tests\\oe_translation\\": "./build/modules/contrib/oe_translation/tests/src"
}
},
"extra": {
Expand Down
6 changes: 0 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@ services:
PHP_IDE_CONFIG: "serverName=Docker"
# Enable step debugging for all PHP request. See ./README.md#step-debugging for more information.
# XDEBUG_SESSION: 1
POETRY_IDENTIFIER_SEQUENCE: "NEXT_EUROPA_COUNTER"
POETRY_SERVICE_ENDPOINT: "http://localhost:8080/build/poetry-mock/wsdl"
POETRY_SERVICE_USERNAME: "admin"
POETRY_SERVICE_PASSWORD: "admin"
POETRY_NOTIFICATION_USERNAME: "admin"
POETRY_NOTIFICATION_PASSWORD: "admin"
mysql:
image: percona/percona-server:5.7
command: --innodb-log-file-size=1G --max_allowed_packet=1G --innodb-buffer-pool-size=512M --wait_timeout=3000 --net_write_timeout=3000 --log_error_verbosity=3
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.