Skip to content

Commit a12f8b5

Browse files
christian34christian34
committed
align version between conda and setuptools_scm
remove deprecated refs to incubator test ci relocation
1 parent 4e17587 commit a12f8b5

4 files changed

Lines changed: 21 additions & 7 deletions

File tree

‎.github/workflows/conda-package-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212

1313
jobs:
1414
build:
15-
uses: openalea/github-action-conda-build/.github/workflows/conda-package-build.yml@main
15+
uses: openalea/github-action-conda-build/.github/workflows/conda-package-build.yml@relocate_action
1616
with:
1717
python-minor-version: "[9, 10, 11, 12]"
1818
secrets:

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ A detailed overview on how to contribute can be found in the [contributing guide
6565

6666
Thanks to all that ontribute making this package what it is !
6767

68-
<a href="https://github.com/openalea-incubator/astk/graphs/contributors">
69-
<img src="https://contrib.rocks/image?repo=openalea-incubator/astk" />
68+
<a href="https://github.com/openalea/astk/graphs/contributors">
69+
<img src="https://contrib.rocks/image?repo=openalea/astk" />
7070
</a>
7171

7272

‎conda/meta.yaml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
{% set pyproject = load_file_data('../pyproject.toml', from_recipe_dir=True) %}
2+
{# Align version with the one computed by setuptools_scm #}
3+
{% set base_tag = GIT_DESCRIBE_TAG | default("0.0.0.dev0") | replace("v", "") %}
4+
{% set distance = GIT_DESCRIBE_NUMBER | default("0") | int %}
5+
{% set base_parts = base_tag.split('.') %}
6+
{% set micro = base_parts[2] | int %}
7+
{% set next_version = base_parts[0] + "." + base_parts[1] + "." + (micro + 1)|string %}
8+
{% set scm_version = next_version + ".dev" + distance|string if distance > 0 else base_tag %}
9+
{% set version = environ.get('SETUPTOOLS_SCM_PRETEND_VERSION', scm_version) %}
10+
211

312
package:
413
name: {{ pyproject["project"]["name"] }}
5-
version: {{ GIT_DESCRIBE_TAG | replace("v", "")}}
14+
version: {{ version }}
615

716
source:
817
path: ..

‎pyproject.toml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ where = ["src"]
1111

1212
# enable dynamic version based on git tags
1313
[tool.setuptools_scm]
14+
# Configure to align with the one of meta.yaml
15+
fallback_version = "0.0.0.dev0"
16+
version_scheme = "guess-next-dev"
17+
local_scheme = "no-local-version"
18+
1419

1520
[project]
1621
name = "openalea.astk"
@@ -53,10 +58,10 @@ plot = [
5358
"astk" = "openalea.astk_wralea"
5459

5560
[project.urls]
56-
Repository= "https://github.com/openalea-incubator/astk"
61+
Repository= "https://github.com/openalea/astk"
5762
Homepage = "https://openalea_astk.readthedocs.io/"
58-
"Bug Tracker" = "https://github.com/openalea-incubator/astk/issues"
59-
Discussions = "https://github.com/openalea-incubator/astk/discussions"
63+
"Bug Tracker" = "https://github.com/openalea/astk/issues"
64+
Discussions = "https://github.com/openalea/astk/discussions"
6065

6166
# not used yet
6267
[tool.conda.environment]

0 commit comments

Comments
 (0)