From a78623f5ae6891144b9581709847328b93342e1d Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Sat, 1 Mar 2025 13:34:57 +0400 Subject: [PATCH 1/8] deps de dev --- composer.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1e0216a..2aa641b 100644 --- a/composer.json +++ b/composer.json @@ -3,6 +3,10 @@ "type": "library", "description": "wrapper pour phpoffice/phpspreadsheet", "repositories": [ + { + "type": "path", + "url": "../nulib" + }, { "type": "composer", "url": "https://repos.univ-reunion.fr/composer" @@ -15,7 +19,7 @@ } }, "require": { - "nulib/php": "^0.3.0p74", + "nulib/php": "^7.4-dev", "phpoffice/phpspreadsheet": "^1.0", "php": "^7.4" }, From c19123a1da4387a3781382dbc39b5bd98b923ca0 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Sun, 2 Mar 2025 15:33:55 +0400 Subject: [PATCH 2/8] ajout config .pman.yml --- .pman.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .pman.yml diff --git a/.pman.yml b/.pman.yml new file mode 100644 index 0000000..a220438 --- /dev/null +++ b/.pman.yml @@ -0,0 +1,12 @@ +# -*- coding: utf-8 mode: yaml -*- vim:sw=2:sts=2:et:ai:si:sta:fenc=utf-8 + +composer: + profiles: [ dev, dist ] + dev: + link: true + require: + nulib/php: ^7.4-dev + dist: + link: false + require: + nulib/php: ^0.3.0p74 From e6d93d7e7a39c79015fcf85a65f69ae5e5a7259d Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Sun, 2 Mar 2025 19:16:23 +0400 Subject: [PATCH 3/8] maj projet --- .pman.conf | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.pman.conf b/.pman.conf index 272df17..483215c 100644 --- a/.pman.conf +++ b/.pman.conf @@ -9,4 +9,15 @@ TAG_PREFIX= TAG_SUFFIX=p74 HOTFIX=hotf74- DIST= -NOAUTO=1 +NOAUTO= + +AFTER_CREATE_RELEASE=' +pman --composer-select-profile dist +composer u +git commit -am "deps de dist" +' +AFTER_MERGE_RELEASE=' +pman --composer-select-profile dev +composer u +git commit -am "deps de dev" +' From 92017f6b6d0f754ff4cd66a81b9d8c456bacfb09 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Tue, 4 Mar 2025 12:40:14 +0400 Subject: [PATCH 4/8] tracer le hook --- .pman.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.pman.conf b/.pman.conf index 483215c..5d99117 100644 --- a/.pman.conf +++ b/.pman.conf @@ -12,12 +12,16 @@ DIST= NOAUTO= AFTER_CREATE_RELEASE=' +set -x pman --composer-select-profile dist composer u git commit -am "deps de dist" +true ' AFTER_MERGE_RELEASE=' +set -x pman --composer-select-profile dev composer u git commit -am "deps de dev" +true ' From 5e99fe9542319be1526a872232d2ebb020c990cc Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Tue, 4 Mar 2025 12:47:52 +0400 Subject: [PATCH 5/8] maj projet --- .pman.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pman.conf b/.pman.conf index 5d99117..db579e6 100644 --- a/.pman.conf +++ b/.pman.conf @@ -14,14 +14,14 @@ NOAUTO= AFTER_CREATE_RELEASE=' set -x pman --composer-select-profile dist -composer u +composer u || exit 1 git commit -am "deps de dist" true ' AFTER_MERGE_RELEASE=' set -x pman --composer-select-profile dev -composer u +composer u || exit 1 git commit -am "deps de dev" true ' From 36d801e07e346a1b2b1aadf718aa85b0ebed31b4 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Fri, 14 Mar 2025 15:27:19 +0400 Subject: [PATCH 6/8] maj deps --- .pman.yml | 2 +- composer.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pman.yml b/.pman.yml index a220438..0786fbb 100644 --- a/.pman.yml +++ b/.pman.yml @@ -9,4 +9,4 @@ composer: dist: link: false require: - nulib/php: ^0.3.0p74 + nulib/php: ^0.4.0p74 diff --git a/composer.lock b/composer.lock index c751670..c0e0bb8 100644 --- a/composer.lock +++ b/composer.lock @@ -400,7 +400,7 @@ "dist": { "type": "path", "url": "../nulib", - "reference": "939f7726ab139071e8a3ef5c83fc147fba859d9d" + "reference": "927915093af5196099ae26645c07e90ddf1b2330" }, "require": { "ext-json": "*", From 12451be27721f75af5dd513f0db527559b62b589 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Fri, 14 Mar 2025 15:27:56 +0400 Subject: [PATCH 7/8] Init changelog & version 0.4.0p74 --- CHANGES.md | 6 ++++++ VERSION.txt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index e10d072..e70d371 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,9 @@ +## Release 0.4.0p74 du 14/03/2025-15:27 + +* maj nulib +* `92017f6` tracer le hook +* `c19123a` ajout config .pman.yml + ## Release 0.3.0p74 du 01/03/2025-13:18 release initiale diff --git a/VERSION.txt b/VERSION.txt index 0d91a54..1d0ba9e 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -0.3.0 +0.4.0 From 0837e57eca36ee3a8d9cd0b40bfe9ca4696e89ae Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Fri, 14 Mar 2025 15:28:01 +0400 Subject: [PATCH 8/8] deps de dist --- composer.json | 6 +----- composer.lock | 20 ++++++++------------ 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/composer.json b/composer.json index 2aa641b..6ba2589 100644 --- a/composer.json +++ b/composer.json @@ -3,10 +3,6 @@ "type": "library", "description": "wrapper pour phpoffice/phpspreadsheet", "repositories": [ - { - "type": "path", - "url": "../nulib" - }, { "type": "composer", "url": "https://repos.univ-reunion.fr/composer" @@ -19,7 +15,7 @@ } }, "require": { - "nulib/php": "^7.4-dev", + "nulib/php": "^0.4.0p74", "phpoffice/phpspreadsheet": "^1.0", "php": "^7.4" }, diff --git a/composer.lock b/composer.lock index c0e0bb8..1707850 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d4342f68b5a710c89ae6ee1159f698c9", + "content-hash": "4bcf3eac04a923082745ca17b3c0e147", "packages": [ { "name": "composer/pcre", @@ -396,11 +396,11 @@ }, { "name": "nulib/php", - "version": "dev-dev74", - "dist": { - "type": "path", - "url": "../nulib", - "reference": "927915093af5196099ae26645c07e90ddf1b2330" + "version": "0.4.0p74", + "source": { + "type": "git", + "url": "https://git.univ-reunion.fr/sda-php/nulib.git", + "reference": "559feda663fc99f8baee2ba32f164b19bdd01927" }, "require": { "ext-json": "*", @@ -438,9 +438,7 @@ } ], "description": "fonctions et classes essentielles", - "transport-options": { - "relative": true - } + "time": "2025-03-14T11:23:41+00:00" }, { "name": "phpoffice/phpspreadsheet", @@ -2844,9 +2842,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "nulib/php": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": {