diff --git a/.github/workflows/conda-package-build.yml b/.github/workflows/openalea_ci.yml similarity index 56% rename from .github/workflows/conda-package-build.yml rename to .github/workflows/openalea_ci.yml index aa5d5c5..3d610de 100644 --- a/.github/workflows/conda-package-build.yml +++ b/.github/workflows/openalea_ci.yml @@ -15,6 +15,16 @@ on: release: types: - published + workflow_dispatch: + inputs: + check_before_tag: + description: "Run OpenAlea CI pre-tag build" + required: false + default: "true" + type: boolean + +run-name: > + ${{ github.event_name == 'workflow_dispatch' && 'OpenAlea CI pre-tag build' || 'OpenAlea CI' }} jobs: build: diff --git a/README.md b/README.md index 9ab926e..949751f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # PyQGLViewer - -[![Build Status](https://travis-ci.org/fredboudon/PyQGLViewer.svg?branch=master)](https://travis-ci.org/fredboudon/PyQGLViewer) [![Build status](https://ci.appveyor.com/api/projects/status/7jo1h7frejsot8uh/branch/master?svg=true)](https://ci.appveyor.com/project/fredboudon/pyqglviewer/branch/master) +![ workflow](https://github.com/openalea/PyQGLViewer/actions/workflows/conda-package-build.yml/badge.svg) ## Presentation diff --git a/conda/meta.yaml b/conda/meta.yaml index 675e5e5..981986a 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -22,7 +22,7 @@ build: requirements: build: - - {{ compiler('cxx')}} + - {{ compiler('cxx')}} - make # [unix] - pkg-config # [linux] - {{ cdt('mesa-libgl-devel') }} # [linux] @@ -62,4 +62,4 @@ test: source_files: # [unix] - test/*.py # [unix] commands: # [unix] - - pytest -v # [unix] \ No newline at end of file + - pytest -v # [unix] \ No newline at end of file diff --git a/setup.py.old b/setup.py.old deleted file mode 100644 index 6ececf6..0000000 --- a/setup.py.old +++ /dev/null @@ -1,59 +0,0 @@ -# Header -import os, sys -pj = os.path.join - -name = 'PyQGLViewer' -description = 'Python bindings of libQGLViewer.' -long_description= 'PyQGLViewer is a set of Python bindings for the libQGLViewer C++ library which extends the Qt framework with widgets and tools that eases the creation of OpenGL 3D viewers.' -authors = 'Frédéric Boudon' -authors_email = 'frederic.boudon@cirad.fr' -url= 'https://github.com/fredboudon/PyQGLViewer' -# LGPL compatible INRIA license -license = 'Cecill-C' - -############## -# Setup script - - -# check that meta version is updated -def get_version(): - versionfile = open(pj(os.path.dirname(__file__),'sip', 'PyQGLViewer', 'qglviewerversion.sip')).read() - lid = versionfile.index('#define PYQGLVIEWER_VERSION') - version = int(versionfile[lid:versionfile.index('\n',lid)].split()[2],16) - major = (version & 0xff0000) >> 16 - minor = (version & 0x00ff00) >> 8 - rev = (version & 0x0000ff) - return str(major)+'.'+str(minor)+'.'+str(rev) - -version = get_version() - - -from setuptools import setup - - -setup( - name='PyQGLViewer', - # version=version, - # description=description, - # long_description=long_description, - # authors=authors, - # author_email=authors_email, - # url=url, - # license=license, - - # pure python packages - packages = [ - 'PyQGLViewer' - ], - - # python packages directory - package_dir = { '' : 'src',}, - - package_data={ - "": ['*.pyd', '*.so', '*.dylib'], - }, - - include_package_data = True, - zip_safe = False, - -)