From bae662aaefb4a9bb9657b3525bae310e6e3b417a Mon Sep 17 00:00:00 2001 From: pradal Date: Mon, 22 Jan 2024 22:47:33 +0100 Subject: [PATCH 1/5] Update namespace package --- setup.py | 4 ++-- src/openalea/__init__.py | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 src/openalea/__init__.py diff --git a/setup.py b/setup.py index 4038384..b1b1e15 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ import sys import os -from setuptools import setup, find_packages +from setuptools import setup, find_namespace_packages name = "OpenAlea.GraphEditor" description= "GraphEditor package for OpenAlea." @@ -22,7 +22,7 @@ version = _version["__version__"] namespace = 'openalea' -packages=find_packages('src') +packages = find_namespace_packages(where='src', include=['openalea', 'openalea.*']) package_dir={'': 'src'} setup_requires = ['openalea.deploy'] diff --git a/src/openalea/__init__.py b/src/openalea/__init__.py deleted file mode 100644 index adc399a..0000000 --- a/src/openalea/__init__.py +++ /dev/null @@ -1,9 +0,0 @@ - -try: - import pkg_resources - pkg_resources.declare_namespace(__name__) -except ImportError: - import pkgutil - __path__ = pkgutil.extend_path(__path__, __name__) - - \ No newline at end of file From c61059e3cbc149a8e23c5eaa8a777cf8a5968f3d Mon Sep 17 00:00:00 2001 From: pradal Date: Mon, 22 Jan 2024 22:48:06 +0100 Subject: [PATCH 2/5] Update to version 2.3.0 --- src/openalea/grapheditor/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openalea/grapheditor/version.py b/src/openalea/grapheditor/version.py index 840cbfc..f4e0499 100644 --- a/src/openalea/grapheditor/version.py +++ b/src/openalea/grapheditor/version.py @@ -5,7 +5,7 @@ MAJOR = 2 """(int) Version major component.""" -MINOR = 2 +MINOR = 3 """(int) Version minor component.""" POST = 0 From 26da67e4c0c88a3989a14557a913198a1f2eec6f Mon Sep 17 00:00:00 2001 From: pradal Date: Tue, 23 Jan 2024 09:57:57 +0100 Subject: [PATCH 3/5] Fix namespace package definition --- setup.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/setup.py b/setup.py index b1b1e15..c643c4e 100644 --- a/setup.py +++ b/setup.py @@ -22,13 +22,10 @@ version = _version["__version__"] namespace = 'openalea' -packages = find_namespace_packages(where='src', include=['openalea', 'openalea.*']) +packages = find_namespace_packages(where='src', include=['openalea.*']) package_dir={'': 'src'} setup_requires = ['openalea.deploy'] -install_requires = [] -# web sites where to find eggs -dependency_links = [] # setup function call # @@ -56,8 +53,6 @@ # Dependencies setup_requires=setup_requires, - install_requires=install_requires, - dependency_links=dependency_links, include_package_data=True, ) From 80047509f298f11d049a57d678a1fac151d2698a Mon Sep 17 00:00:00 2001 From: pradal Date: Tue, 23 Jan 2024 09:59:14 +0100 Subject: [PATCH 4/5] Update CI --- .github/workflows/conda-package-build.yml | 77 +++++------------------ 1 file changed, 15 insertions(+), 62 deletions(-) diff --git a/.github/workflows/conda-package-build.yml b/.github/workflows/conda-package-build.yml index 99f4694..ecaf733 100644 --- a/.github/workflows/conda-package-build.yml +++ b/.github/workflows/conda-package-build.yml @@ -1,67 +1,20 @@ -name: build_publish_anaconda +name: Building Package 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] - python-minor-version: [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' - channels: openalea3, conda-forge - token: ${{ secrets.ANACONDA_TOKEN }} - publish: ${{ steps.publish.outputs.value }} - label: main +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 }} From a9235b0102e7c77d990e3a742a2a866e85cf7092 Mon Sep 17 00:00:00 2001 From: pradal Date: Tue, 23 Jan 2024 09:59:46 +0100 Subject: [PATCH 5/5] Update version to 2.4.0 --- src/openalea/grapheditor/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openalea/grapheditor/version.py b/src/openalea/grapheditor/version.py index f4e0499..7d1f93c 100644 --- a/src/openalea/grapheditor/version.py +++ b/src/openalea/grapheditor/version.py @@ -5,7 +5,7 @@ MAJOR = 2 """(int) Version major component.""" -MINOR = 3 +MINOR = 4 """(int) Version minor component.""" POST = 0