Mentions légales du service
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
vt-python
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
morpheme
vt-python
Commits
2d1eae2c
Commit
2d1eae2c
authored
4 months ago
by
LEGRAND Jonathan
Browse files
Options
Downloads
Plain Diff
Merge branch 'release/1.3.3' into develop
parents
7ec2cc0d
2a1f5ca2
No related branches found
No related tags found
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
CHANGES.md
+28
-0
28 additions, 0 deletions
CHANGES.md
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
doc/source/conf.py
+1
-1
1 addition, 1 deletion
doc/source/conf.py
pkg/recipe/meta.yaml
+0
-2
0 additions, 2 deletions
pkg/recipe/meta.yaml
pyproject.toml
+1
-1
1 addition, 1 deletion
pyproject.toml
with
31 additions
and
5 deletions
CHANGES.md
+
28
−
0
View file @
2d1eae2c
# Change Log
## version 1.3.3 - 2025-04-04
Fix & Enhance CI Pipeline: Conda Package Management and Build Improvements
This merge request introduces several improvements to the CI pipeline, focusing on:
-
Conda package management
-
Build process optimization
### CI Pipeline Enhancements
-
Added a new
`update`
stage for manual conda and conda-build updates
-
Replaced
`mambabuild`
with
`conda build`
across all build jobs
-
Added
`-c default`
channel to improve package resolution
-
Implemented platform-specific update jobs for Linux, macOS, Windows, and ARM64
### OSX Package Management
-
Updated package management strategy for
`xz`
and
`libarchive`
-
Added version constraints to ensure compatibility
### Documentation Updates
-
Clarified
`mambabuild`
limitations
-
Updated README and installation documentation
-
Added notes about conda build process and channel usage
### Improvements
-
Improved error handling in CI jobs
-
Added more detailed logging and debugging steps
-
Marked update jobs as
`allow_failure`
to prevent pipeline blockage
## version 1.3.2 - 2025-04-03
This version requires
`vt`
package version
`1.6.3`
or higher.
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
1
−
1
View file @
2d1eae2c
...
...
@@ -19,7 +19,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
set
(
${
PROJECT_NAME
}
_VERSION_MAJOR 1
)
set
(
${
PROJECT_NAME
}
_VERSION_MINOR 3
)
set
(
${
PROJECT_NAME
}
_VERSION_PATCH
2
)
set
(
${
PROJECT_NAME
}
_VERSION_PATCH
3
)
set
(
${
PROJECT_NAME
}
_VERSION
${${
PROJECT_NAME
}
_VERSION_MAJOR
}
.
${${
PROJECT_NAME
}
_VERSION_MINOR
}
.
${${
PROJECT_NAME
}
_VERSION_PATCH
}
)
...
...
This diff is collapsed.
Click to expand it.
doc/source/conf.py
+
1
−
1
View file @
2d1eae2c
...
...
@@ -22,7 +22,7 @@ copyright = '2021, Grégoire MALANDAIN'
author
=
'
Grégoire MALANDAIN
'
# The full version, including alpha/beta/rc tags
release
=
'
1.3.
2
'
release
=
'
1.3.
3
'
# -- General configuration ---------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
pkg/recipe/meta.yaml
+
0
−
2
View file @
2d1eae2c
...
...
@@ -3,7 +3,6 @@
{
%
set urls = project.get('urls'
,
{}
) %
}
# Get URLs from project metadata
{
%
set build_system = pyproject.get('build-system'
,
{}
) %
}
# Extract build-system info
{
%
set build_requires = build_system.get('requires'
,
[]
) %
}
# Get build requirements
{
%
set readme = load_file_data('../../README.md'
,
'
text'
,
from_recipe_dir=True) %
}
# References for conda-build metadata and Jinja context functionality
# https://docs.conda.io/projects/conda-build/en/latest/resources/define-metadata.html#loading-data-from-other-files
...
...
@@ -63,7 +62,6 @@ test:
about
:
home
:
{{
urls.get('homepage'
,
'
'
)
}}
# Project homepage
summary
:
{{
project.get('description'
,
'
'
)
}}
# Package summary
description
:
{{
readme
}}
dev_url
:
{{
urls.get('source'
,
'
'
)
}}
# Repository URL
license
:
Inria
license_file
:
LICENSE.txt
\ No newline at end of file
This diff is collapsed.
Click to expand it.
pyproject.toml
+
1
−
1
View file @
2d1eae2c
...
...
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project]
name
=
"vtpython"
version
=
"1.3.
2
"
version
=
"1.3.
3
"
authors
=
[
{
name
=
"Gregoire Malandain"
,
email
=
"gregoire.malandain@inria.fr"
}
,
{
name
=
"Jonathan Legrand"
,
email
=
"jonathan.legrand@ens-lyon.fr"
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment