diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index d9d9b72cb..868eb148e 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -16,12 +16,12 @@ Please fill in the description following the template. 2. Pull the latest `master` and branch out to a release branch `chore/release-x` -3. Create a change log entry for the release by running `npm run changelog`. The command will find all the labeled pull requests merged since the last release and create a change log entry with all the changes and links to PRs and their authors. Copy and paste it to the top of `CHANGELOG.md`. +3. **Run `npm run publish` (NOT `npm publish`)** -4. **Run `npm run publish` (NOT `npm publish`)** +4. The CLI will ask for a confirmation about the new package versions. Please verify them carefully before accepting. -5. The CLI will ask for a confirmation about the new package versions. Please verify them carefully before accepting. +5. Once you have accepted, the script will increment lerna (project) version and the version of the packages changed. -6. Once you have accepted, the script will increment lerna (project) version and the version of the packages changed. +6. Create a change log entry for the release by running `npm run changelog`. The command will find all the labeled pull requests merged since the last release and create a change log entry with all the changes and links to PRs and their authors. Copy and paste it to the top of `CHANGELOG.md`. 7. Commit changes in the release branch and open a pull request. When it's merged, create a new release on GitHub. diff --git a/CHANGELOG.md b/CHANGELOG.md index 613b7519b..db281ebf9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,25 @@ # Change Log +## 0.2.0 (2018-08-08) + +#### :rocket: New Feature + +- [#153](https://github.com/ec-europa/eubfr-data-lake/pull/153) feat(etl): add data from DG HOME - EUBFR-201 ([@kalinchernev](https://github.com/kalinchernev)) +- [#145](https://github.com/ec-europa/eubfr-data-lake/pull/145) feat(etl): add cordis and H2020 - EUBFR-200 ([@raduchiriac](https://github.com/raduchiriac)) + +#### :boom: Breaking Change + +- [#152](https://github.com/ec-europa/eubfr-data-lake/pull/152) feat(etl): add field for marking public information - EUBFR-154 ([@kalinchernev](https://github.com/kalinchernev)) + +#### :bug: Bug Fix + +- [#155](https://github.com/ec-europa/eubfr-data-lake/pull/155) fix(etl): corrections in DG HOME - EUBFR-201 ([@kalinchernev](https://github.com/kalinchernev)) + +#### Committers: 2 + +- Kalin Chernev ([@kalinchernev](https://github.com/kalinchernev)) +- Radu Chiriac ([@raduchiriac](https://github.com/raduchiriac)) + ## 0.1.1 (2018-07-31) #### :bug: Bug Fix diff --git a/lerna.json b/lerna.json index c27bc275d..1932b001d 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "2.11.0", - "version": "0.1.1", + "version": "0.2.0", "npmClient": "yarn", "useWorkspaces": true, "changelog": { diff --git a/resources/elasticsearch/package.json b/resources/elasticsearch/package.json index f8515c4ff..25cda604e 100644 --- a/resources/elasticsearch/package.json +++ b/resources/elasticsearch/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@eubfr/resources-elasticsearch", - "version": "0.1.0", + "version": "0.2.0", "scripts": { "deploy": "sls deploy -v" }, diff --git a/services/enrichment/fields/budget/package.json b/services/enrichment/fields/budget/package.json index 873e674e3..181498d09 100644 --- a/services/enrichment/fields/budget/package.json +++ b/services/enrichment/fields/budget/package.json @@ -1,13 +1,13 @@ { "private": true, "name": "@eubfr/enrichment-fields-budget", - "version": "0.1.0", + "version": "0.2.0", "scripts": { "deploy": "sls deploy -v", "test:unit": "jest --testPathPattern=unit" }, "devDependencies": { - "@eubfr/types": "^0.1.0", + "@eubfr/types": "^0.2.0", "aws-sdk": "2.248.1", "babel-core": "6.26.3", "babel-loader": "7.1.4", diff --git a/services/ingestion/etl/agri/csv/package.json b/services/ingestion/etl/agri/csv/package.json index 3f15118d7..28670c8d6 100644 --- a/services/ingestion/etl/agri/csv/package.json +++ b/services/ingestion/etl/agri/csv/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@eubfr/ingestion-etl-agri-csv", - "version": "0.1.0", + "version": "0.2.0", "scripts": { "deploy": "sls deploy -v", "test:unit": "jest --testPathPattern=unit" @@ -13,7 +13,7 @@ "stream-transform": "1.0.2" }, "devDependencies": { - "@eubfr/types": "^0.1.0", + "@eubfr/types": "^0.2.0", "aws-sdk": "2.248.1", "babel-core": "6.26.3", "babel-loader": "7.1.4", diff --git a/services/ingestion/etl/budg/xls/package.json b/services/ingestion/etl/budg/xls/package.json index beccabaef..7d4ba0cb4 100644 --- a/services/ingestion/etl/budg/xls/package.json +++ b/services/ingestion/etl/budg/xls/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@eubfr/ingestion-etl-budg-xls", - "version": "0.1.0", + "version": "0.2.0", "scripts": { "deploy": "sls deploy -v", "test:unit": "jest --testPathPattern=unit" @@ -12,7 +12,7 @@ "xlsx": "0.12.13" }, "devDependencies": { - "@eubfr/types": "^0.1.0", + "@eubfr/types": "^0.2.0", "aws-sdk": "2.248.1", "babel-core": "6.26.3", "babel-loader": "7.1.4", diff --git a/services/ingestion/etl/cordis/csv/package.json b/services/ingestion/etl/cordis/csv/package.json index ebf1d7eb7..adbe0a06a 100644 --- a/services/ingestion/etl/cordis/csv/package.json +++ b/services/ingestion/etl/cordis/csv/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@eubfr/ingestion-etl-cordis-csv", - "version": "0.1.0", + "version": "0.2.0", "scripts": { "deploy": "sls deploy -v", "test:unit": "jest --testPathPattern=unit" @@ -13,7 +13,7 @@ "stream-transform": "1.0.2" }, "devDependencies": { - "@eubfr/types": "^0.1.0", + "@eubfr/types": "^0.2.0", "aws-sdk": "2.248.1", "babel-core": "6.26.3", "babel-loader": "7.1.4", diff --git a/services/ingestion/etl/home/xls/package.json b/services/ingestion/etl/home/xls/package.json index 426c5aad4..608cc3951 100644 --- a/services/ingestion/etl/home/xls/package.json +++ b/services/ingestion/etl/home/xls/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@eubfr/ingestion-etl-home-xls", - "version": "0.1.0", + "version": "0.2.0", "scripts": { "deploy": "sls deploy -v", "test:unit": "jest --testPathPattern=unit" @@ -12,7 +12,7 @@ "xlsx": "0.12.13" }, "devDependencies": { - "@eubfr/types": "^0.1.0", + "@eubfr/types": "^0.2.0", "aws-sdk": "2.248.1", "babel-core": "6.26.3", "babel-loader": "7.1.4", diff --git a/services/ingestion/etl/iati/csv/package.json b/services/ingestion/etl/iati/csv/package.json index 4945076c3..c865168e8 100644 --- a/services/ingestion/etl/iati/csv/package.json +++ b/services/ingestion/etl/iati/csv/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@eubfr/ingestion-etl-iati-csv", - "version": "0.1.0", + "version": "0.2.0", "scripts": { "deploy": "sls deploy -v", "test:unit": "jest --testPathPattern=unit" @@ -13,7 +13,7 @@ "stream-transform": "1.0.2" }, "devDependencies": { - "@eubfr/types": "^0.1.0", + "@eubfr/types": "^0.2.0", "aws-sdk": "2.248.1", "babel-core": "6.26.3", "babel-loader": "7.1.4", diff --git a/services/ingestion/etl/inforegio/json/package.json b/services/ingestion/etl/inforegio/json/package.json index bcc5ee43a..b43df7a10 100644 --- a/services/ingestion/etl/inforegio/json/package.json +++ b/services/ingestion/etl/inforegio/json/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@eubfr/ingestion-etl-inforegio-json", - "version": "0.1.0", + "version": "0.2.0", "scripts": { "deploy": "sls deploy -v", "test:unit": "jest --testPathPattern=unit" @@ -11,7 +11,7 @@ "@eubfr/logger-messenger": "^0.1.0" }, "devDependencies": { - "@eubfr/types": "^0.1.0", + "@eubfr/types": "^0.2.0", "aws-sdk": "2.248.1", "babel-core": "6.26.3", "babel-loader": "7.1.4", diff --git a/services/ingestion/etl/inforegio/xml/package.json b/services/ingestion/etl/inforegio/xml/package.json index b1708173a..75ff0d5eb 100644 --- a/services/ingestion/etl/inforegio/xml/package.json +++ b/services/ingestion/etl/inforegio/xml/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@eubfr/ingestion-etl-inforegio-xml", - "version": "0.1.0", + "version": "0.2.0", "scripts": { "deploy": "sls deploy -v", "test:unit": "jest --testPathPattern=unit" @@ -12,7 +12,7 @@ "xml2js": "0.4.19" }, "devDependencies": { - "@eubfr/types": "^0.1.0", + "@eubfr/types": "^0.2.0", "aws-sdk": "2.248.1", "babel-core": "6.26.3", "babel-loader": "7.1.4", diff --git a/services/ingestion/etl/just/csv/package.json b/services/ingestion/etl/just/csv/package.json index 033f755af..88f748091 100644 --- a/services/ingestion/etl/just/csv/package.json +++ b/services/ingestion/etl/just/csv/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@eubfr/ingestion-etl-just-csv", - "version": "0.1.0", + "version": "0.2.0", "scripts": { "deploy": "sls deploy -v", "test:unit": "jest --testPathPattern=unit" @@ -13,7 +13,7 @@ "stream-transform": "1.0.2" }, "devDependencies": { - "@eubfr/types": "^0.1.0", + "@eubfr/types": "^0.2.0", "aws-sdk": "2.248.1", "babel-core": "6.26.3", "babel-loader": "7.1.4", diff --git a/services/ingestion/etl/valor/xls/package.json b/services/ingestion/etl/valor/xls/package.json index 03237ddbe..571fa5965 100644 --- a/services/ingestion/etl/valor/xls/package.json +++ b/services/ingestion/etl/valor/xls/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@eubfr/ingestion-etl-valor-xls", - "version": "0.1.0", + "version": "0.2.0", "scripts": { "deploy": "sls deploy -v", "test:unit": "jest --testPathPattern=unit" @@ -12,7 +12,7 @@ "xlsx": "0.12.13" }, "devDependencies": { - "@eubfr/types": "^0.1.0", + "@eubfr/types": "^0.2.0", "aws-sdk": "2.248.1", "babel-core": "6.26.3", "babel-loader": "7.1.4", diff --git a/services/ingestion/etl/wifi4eu/xls/package.json b/services/ingestion/etl/wifi4eu/xls/package.json index fcdf6126f..a6afbc2c9 100644 --- a/services/ingestion/etl/wifi4eu/xls/package.json +++ b/services/ingestion/etl/wifi4eu/xls/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@eubfr/ingestion-etl-wifi4eu-xls", - "version": "0.1.0", + "version": "0.2.0", "scripts": { "deploy": "sls deploy -v", "test:unit": "jest --testPathPattern=unit" @@ -12,7 +12,7 @@ "xlsx": "0.12.13" }, "devDependencies": { - "@eubfr/types": "^0.1.0", + "@eubfr/types": "^0.2.0", "aws-sdk": "2.248.1", "babel-core": "6.26.3", "babel-loader": "7.1.4", diff --git a/types/package.json b/types/package.json index 6b46960d9..6ba5834cb 100644 --- a/types/package.json +++ b/types/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@eubfr/types", - "version": "0.1.0", + "version": "0.2.0", "main": "Project.js", "dependencies": { "flow-geojson": "2.0.6"