sync with working tree in the easyScience repo

Author: rozyczko

.github/workflows/build.yaml

@@ -4,14 +4,13 @@ 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]
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: ['3.8', '3.9', '3.10']
+        os: [ubuntu-latest, macos-latest, windows-latest]
 
-    # runs-on: ${{ matrix.os }}
-    runs-on: windows-latest
+    runs-on: ${{ matrix.os }}
     steps:
     - name: Check-out repository
       uses: actions/checkout@v2
@@ -20,8 +19,7 @@ jobs:
       uses: s-weigand/setup-conda@v1
       with:
         update-conda: true
-        # python-version: ${{ matrix.python-version }}
-        python-version: '3.8'
+        python-version: ${{ matrix.python-version }}
 
     - name: Install dependencies
       run: |
@@ -31,70 +29,33 @@ jobs:
         conda install -c conda-forge pip
         conda install -c conda-forge gsl
 
-    - name: Build package
+    - name: Build wheels
       run: |
         python setup.py sdist bdist_wheel
-        ls -l ${{ github.workspace }}
-        ls -l ${{ github.workspace }}/dist
-        ls -l ${{ github.workspace }}/build
 
-  upload:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-
-    - name: show content
+    - name: Run tests
       run: |
-        ls -l ${{ github.workspace }}/../
-        ls -l ${{ github.workspace }}/../dist
+        conda install -c conda-forge numpy
+        python setup.py install
+        python conda-recipe/run_test.py
 
-    - uses: actions/upload-artifact@v2
+    - name: Upload Artifacts GitHub releases
+      uses: ncipollo/release-action@v1
       with:
-        name: diffpy2 - Python ${{ matrix.python-version }}
-        path: ${{ github.workspace }}/dist/*.whl
-
-    # - name: Upload zipped offline app installer to GitHub releases
-    #   uses: ncipollo/release-action@v1
+        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:
-    #     draft: true
-    #     prerelease: true
-    #     allowUpdates: true
-    #     replacesArtifacts: true
-    #     token: ${{ secrets.GITHUB_TOKEN }}
-    #     artifacts: dist/*.whl
-    #     tag: 1.4.1
-    #     body: This is an alpha build of diffpy2
-
-
-  # upload:
-  #   steps:
-  #   - name: Checkout target repo
-  #     uses: actions/checkout@v3
-  #     env:
-  #       REPO: easyScience/pypi
-  #       REPO_PATH: pypi
-  #     with:
-  #       fetch-depth: 0
-  #       token: ${{ secrets.ES_TOKEN }}
-  #       repository: ${{ env.REPO }}
-  #       path: ${{ env.REPO_PATH }}
-
-  #   - name: Copy index to new repo
-  #     env:
-  #       SOURCE: index.html
-  #       TARGET: pypi/easysciencecore/
-  #     run: cp ${{ env.SOURCE }} ${{ env.TARGET }}
-  #   - name: Push
-  #     env:
-  #       REPO_PATH: pypi
-  #       GIT_USERNAME: action
-  #       GIT_EMAIL: action@github.com
-  #     run: |
-  #       cd ${{ env.REPO_PATH }}
-  #       git config --local user.name "${{ env.GIT_USERNAME }}"
-  #       git config --local user.email "${{ env.GIT_EMAIL }}"
-  #       git add .
-  #       if [[ `git status --porcelain` ]]; then
-  #         git commit -m "Github Actions Automatically Built in `date +"%Y-%m-%d %H:%M"`"
-  #         git push
-  #       fi
+    #     password: ${{ secrets.PYPI_API_TOKEN }}

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>

pdffit2module/bindings.cc

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

pdffit2module/misc.cc

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

pdffit2module/pdffit2module.cc

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

pdffit2module/pyexceptions.cc

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

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
 
 
@@ -163,25 +164,6 @@ def get_gsl_config_win():
     library_dirs += gcfg['library_dirs']
 # add optimization flags for other compilers if needed
 
-# print("INCLUDE DIR = {!r}".format(include_dirs))
-# print("LIBRARY DIR = {!r}".format(library_dirs))
-# import glob
-
-# pattern = 'gsl*.*'
-
-# library_dir = library_dirs[0]
-# matching_files = glob.glob(library_dir + '/' + pattern)
-# if len(matching_files) != 0:
-#     print("GSL LIBRARY FOUND in {!r}".format(matching_files[0]))
-
-# print("----- CONDA -----")
-# library_dir = "C:\\Miniconda"
-# matching_files = glob.glob(library_dir + '\\' + pattern)
-# if len(matching_files) != 0:
-#     for f in matching_files:
-#         print(f)
-# # print("GSL LIBRARY FOUND in {!r}".format(matching_files[0]))
-# print("----- CONDA END -----")
 
 # define extension here
 pdffit2module = Extension('diffpy.pdffit2.pdffit2', [