test 3.10

Author: rozyczko

.github/workflows/build.yaml

@@ -8,7 +8,7 @@ jobs:
       max-parallel: 4
       matrix:
         # python-version: ['3.8', '3.9', '3.10']
-        python-version: ['3.8']
+        python-version: ['3.10']
         os: [ubuntu-latest, macos-latest, windows-latest]
 
     runs-on: ${{ matrix.os }}
@@ -41,11 +41,6 @@ jobs:
         python setup.py install
         python conda-recipe/run_test.py
 
-    # - uses: actions/upload-artifact@v2
-    #   with:
-    #     name: diffpy2-${{ matrix.os }}-${{ matrix.python-version }}
-    #     path: ${{ github.workspace }}/dist/*.whl
-
     - name: Upload Artifacts GitHub releases
       uses: ncipollo/release-action@v1
       with:
@@ -58,34 +53,34 @@ jobs:
         tag: 1.4.0
         body: This is an alpha build of the pdffit2 library (1.4.0)
 
-    - 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 }}
-        ref: "pdffit"  # temporarily, switch branch from master
-    - name: Copy index to new repo
-      env:
-        SOURCE: index.html
-        TARGET: pypi/pdffit2/
-      run: cp ${{ env.SOURCE }} ${{ env.TARGET }}
-    - name: Push
-      env:
-        REPO_PATH: pypi
-        GIT_USERNAME: action
-        GIT_EMAIL: [email protected]
-      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
-  #       fi
+  #   - 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 }}
+  #       ref: "pdffit"  # temporarily, switch branch from master
+  #   - name: Copy index to new repo
+  #     env:
+  #       SOURCE: index.html
+  #       TARGET: pypi/pdffit2/
+  #     run: cp ${{ env.SOURCE }} ${{ env.TARGET }}
+  #   - name: Push
+  #     env:
+  #       REPO_PATH: pypi
+  #       GIT_USERNAME: action
+  #       GIT_EMAIL: [email protected]
+  #     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
+  # #       fi

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()