Merge pull request #11 from rozyczko/master

multiplatform CI

Author: dragonyanglong

Diff for: .github/workflows/build.yaml

@@ -0,0 +1,61 @@
+name: build and upload
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: ['3.8', '3.9', '3.10']
+        os: [ubuntu-latest, macos-latest, windows-latest]
+
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Check-out repository
+      uses: actions/checkout@v2
+
+    - name: set up conda
+      uses: s-weigand/setup-conda@v1
+      with:
+        update-conda: true
+        python-version: ${{ matrix.python-version }}
+
+    - name: Install dependencies
+      run: |
+        conda install -c conda-forge twine
+        conda install -c conda-forge wheel
+        conda install -c conda-forge setuptools
+        conda install -c conda-forge pip
+        conda install -c conda-forge gsl
+
+    - name: Build wheels
+      run: |
+        python setup.py sdist bdist_wheel
+
+    - name: Run tests
+      run: |
+        conda install -c conda-forge numpy
+        python setup.py install
+        python conda-recipe/run_test.py
+
+    - name: Upload Artifacts GitHub releases
+      uses: ncipollo/release-action@v1
+      with:
+        draft: false
+        prerelease: true
+        allowUpdates: true
+        replacesArtifacts: true
+        token: ${{ secrets.GITHUB_TOKEN }}
+        artifacts: ${{ github.workspace }}/dist/*.whl
+        tag: 1.4.0
+        body: This is an alpha build of the pdffit2 library (1.4.0)
+
+    # This step will upload tagged commits to pypi.
+    # The pypi token must be added to GH secrets
+    # 
+    # - name: Publish package
+    #   if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
+    #   uses: pypa/gh-action-pypi-publish@release/v1
+    #   with:
+    #     password: ${{ secrets.PYPI_API_TOKEN }}

Diff for: pdffit2module/PyFileStreambuf.h

@@ -25,6 +25,7 @@
 
 #ifndef PYFILESTREAMBUF_H_INCLUDED
 #define PYFILESTREAMBUF_H_INCLUDED
+#define PY_SSIZE_T_CLEAN
 
 #include <Python.h>
 #include <streambuf>

Diff for: pdffit2module/bindings.cc

@@ -17,7 +17,7 @@
 * Comments:
 *
 ***********************************************************************/
-
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 
 #include "bindings.h"

Diff for: pdffit2module/misc.cc

@@ -17,7 +17,7 @@
 * Comments:
 *
 ***********************************************************************/
-
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <vector>
 #include <string>

Diff for: pdffit2module/pdffit2module.cc

@@ -17,7 +17,7 @@
 * Comments:
 *
 ***********************************************************************/
-
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <ostream>
 

Diff for: pdffit2module/pyexceptions.cc

@@ -17,7 +17,7 @@
 * Comments:
 *
 ***********************************************************************/
-
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 
 PyObject *pypdffit2_runtimeError = 0;

Diff for: setup.py

@@ -31,15 +31,16 @@
 
 
 def gitinfo():
-    from subprocess import Popen, PIPE
+    from subprocess import Popen, PIPE, check_output
     kw = dict(stdout=PIPE, cwd=MYDIR, universal_newlines=True)
     proc = Popen(['git', 'describe', '--tags', '--match=v[[:digit:]]*'], **kw)
     desc = proc.stdout.read()
     proc = Popen(['git', 'log', '-1', '--format=%H %ct %ci'], **kw)
     glog = proc.stdout.read()
     rv = {}
-    rv['version'] = '.post'.join(desc.strip().split('-')[:2]).lstrip('v')
     rv['commit'], rv['timestamp'], rv['date'] = glog.strip().split(None, 2)
+    version = check_output(['git', 'tag']).decode('ascii').strip()
+    rv['version'] = version
     return rv
 
 
@@ -66,6 +67,7 @@ def getversioncfg():
         except OSError:
             pass
     # finally, check and update the active version file
+
     cp = RawConfigParser()
     cp.read(versioncfgfile)
     d = cp.defaults()
@@ -123,11 +125,27 @@ def get_gsl_config():
     rv['library_dirs'] += [lib]
     return rv
 
+def get_gsl_config_win():
+    '''Return dictionary with paths to GSL library, windwows version.
+       This version is installed with conda.
+    '''
+    conda_prefix = os.environ['CONDA_PREFIX']
+    inc = os.path.join(conda_prefix, 'Library', 'include')
+    lib = os.path.join(conda_prefix, 'Library', 'lib')
+    rv = {'include_dirs': [], 'library_dirs': []}
+    rv['include_dirs'] += [inc]
+    rv['library_dirs'] += [lib]
+    return rv
+
 # ----------------------------------------------------------------------------
 
 # compile and link options
 define_macros = []
-gcfg = get_gsl_config()
+os_name = os.name
+if os_name == 'nt':
+    gcfg = get_gsl_config_win()
+else:
+    gcfg = get_gsl_config()
 include_dirs = [MYDIR] + gcfg['include_dirs']
 library_dirs = []
 libraries = []