From ee58ed4729c54d3b71298c09c41f31afd14da59d Mon Sep 17 00:00:00 2001 From: pradal Date: Wed, 15 Feb 2023 13:33:38 +0100 Subject: [PATCH 1/5] Remove namespace --- setup.py | 4 ++-- src/alinea/__init__.py | 15 --------------- src/alinea/caribu/version.py | 4 ++-- 3 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 src/alinea/__init__.py diff --git a/setup.py b/setup.py index 74f84cf..37bf2b6 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ from os.path import abspath, normpath, dirname from os.path import join as pj -from setuptools import setup, find_packages +from setuptools import setup, find_namespace_packages short_descr = "Python/Visualea interface to Caribu Light model" readme = open('README.rst').read() @@ -50,7 +50,7 @@ def data_rel_pth(pth): license='INRA_License_agreement', zip_safe=False, - packages=find_packages('src'), + packages=find_namespace_packages(where='src', include=['alinea*']), package_dir={'': 'src'}, include_package_data=True, diff --git a/src/alinea/__init__.py b/src/alinea/__init__.py deleted file mode 100644 index 48eeec2..0000000 --- a/src/alinea/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -# -*- python -*- -# -# Copyright 2015 INRIA - CIRAD - INRA -# -# Distributed under the Cecill-C License. -# See accompanying file LICENSE.txt or copy at -# http://www.cecill.info/licences/Licence_CeCILL-C_V1-en.html -# -# WebSite : https://github.com/openalea-incubator/caribu -# -# ============================================================================== - -# {#pkglts, -__import__('pkg_resources').declare_namespace(__name__) -# #} diff --git a/src/alinea/caribu/version.py b/src/alinea/caribu/version.py index 586c169..8a6361e 100644 --- a/src/alinea/caribu/version.py +++ b/src/alinea/caribu/version.py @@ -14,8 +14,8 @@ # -*- coding: utf-8 -*- major = 8 -minor = 0 -post = 10 +minor = 1 +post = 0 __version__ = ".".join([str(s) for s in (major, minor, post)]) # #} From a4e75fd073bc402618018f60ee783db865d9a966 Mon Sep 17 00:00:00 2001 From: pradal Date: Wed, 15 Feb 2023 14:14:29 +0100 Subject: [PATCH 2/5] Move CI to version 0.1.4 --- .github/workflows/conda-package-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda-package-build.yml b/.github/workflows/conda-package-build.yml index 46ac645..a966623 100644 --- a/.github/workflows/conda-package-build.yml +++ b/.github/workflows/conda-package-build.yml @@ -55,7 +55,7 @@ jobs: if_true: 'true' if_false: 'false' - name: Build and Publish - uses: openalea/action-build-publish-anaconda@v0.1.3 + uses: openalea/action-build-publish-anaconda@v0.1.4 with: conda: conda mamba: true From 4b42a070c65bdf1a8ef4496253156ec2fbbd8fe7 Mon Sep 17 00:00:00 2001 From: pradal Date: Sun, 28 May 2023 10:31:09 +0200 Subject: [PATCH 3/5] Update Caribu to Implicit namespace --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 37bf2b6..a157dad 100644 --- a/setup.py +++ b/setup.py @@ -50,7 +50,7 @@ def data_rel_pth(pth): license='INRA_License_agreement', zip_safe=False, - packages=find_namespace_packages(where='src', include=['alinea*']), + packages=find_namespace_packages(where='src', include=['alinea', 'alinea.*']), package_dir={'': 'src'}, include_package_data=True, From 7830c1024ea42e3fb30bd383f60569fe85cf4e9c Mon Sep 17 00:00:00 2001 From: pradal Date: Mon, 22 Jan 2024 12:04:37 +0100 Subject: [PATCH 4/5] Update CI to last version --- .github/workflows/conda-package-build.yml | 72 ++++------------------- 1 file changed, 11 insertions(+), 61 deletions(-) diff --git a/.github/workflows/conda-package-build.yml b/.github/workflows/conda-package-build.yml index a966623..be7ab91 100644 --- a/.github/workflows/conda-package-build.yml +++ b/.github/workflows/conda-package-build.yml @@ -2,66 +2,16 @@ name: build_publish_anaconda on: push: - branches: [ master ] + branches: + - '**' + tags: + - 'v*' pull_request: - branches: [ master ] - -jobs: - build-and-publish: - name: ${{ matrix.os }}, Python 3.${{ matrix.python-minor-version }} for conda deployment - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - max-parallel: 3 - matrix: - os: [ubuntu-latest, macos-latest, windows-latest] - python-minor-version: [7,8,9] - isMaster: - - ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/dev') }} - exclude: - - isMaster: false - os: ubuntu-latest - python-minor-version: 7 - - isMaster: false - os: ubuntu-latest - python-minor-version: 8 - - isMaster: false - os: macos-latest - python-minor-version: 7 - - isMaster: false - os: macos-latest - python-minor-version: 8 - - isMaster: false - os: macos-latest - python-minor-version: 9 - - isMaster: false - os: windows-latest - python-minor-version: 7 - - isMaster: false - os: windows-latest - python-minor-version: 8 - - isMaster: false - os: windows-latest - python-minor-version: 9 + branches: + - '**' - steps: - - name: Chekout - uses: actions/checkout@v3 - - name: Determine publish - uses: haya14busa/action-cond@v1 - id: publish - with: - cond: ${{ contains(github.ref, 'master') || startsWith(github.ref, 'refs/heads/v') }} - if_true: 'true' - if_false: 'false' - - name: Build and Publish - uses: openalea/action-build-publish-anaconda@v0.1.4 - with: - conda: conda - mamba: true - python: ${{ matrix.python-minor-version }} - numpy: '20.0' - channels: openalea3, conda-forge - token: ${{ secrets.ANACONDA_TOKEN }} - publish: ${{ steps.publish.outputs.value }} - label: main \ No newline at end of file +jobs: + build: + uses: openalea/github-action-conda-build/.github/workflows/conda-package-build.yml@main + secrets: + anaconda_token: ${{ secrets.ANACONDA_TOKEN }} \ No newline at end of file From 8ec78d184efb5f62b5e74c21c4268793a8f549cf Mon Sep 17 00:00:00 2001 From: pradal Date: Mon, 22 Jan 2024 13:35:54 +0100 Subject: [PATCH 5/5] Update CI --- .github/workflows/conda-package-build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conda-package-build.yml b/.github/workflows/conda-package-build.yml index be7ab91..ecaf733 100644 --- a/.github/workflows/conda-package-build.yml +++ b/.github/workflows/conda-package-build.yml @@ -1,4 +1,4 @@ -name: build_publish_anaconda +name: Building Package on: push: @@ -10,8 +10,11 @@ on: branches: - '**' + jobs: build: uses: openalea/github-action-conda-build/.github/workflows/conda-package-build.yml@main + with: + conda-channels: openalea3, conda-forge secrets: - anaconda_token: ${{ secrets.ANACONDA_TOKEN }} \ No newline at end of file + anaconda_token: ${{ secrets.ANACONDA_TOKEN }}