Merge pull request #98 from slaclab/pre-release

Release Candidate v3.11.2
slaclab · Apr 1, 2023 · d1a83aa · d1a83aa
2 parents 8180ab8 + 7e3d877
commit d1a83aa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 31 deletions.
diff --git a/.github/workflows/axi_ci.yml b/.github/workflows/axi_ci.yml
@@ -85,7 +85,6 @@ jobs:
       matrix:
         os:
           - ubuntu-20.04
-          - macos-10.15
     runs-on: ${{ matrix.os }}
     steps:
 
@@ -103,37 +102,15 @@ jobs:
           OS_NAME: ${{ matrix.os }}
         run: |
           cd ${HOME}
-          if [ $OS_NAME == "macos-10.15" ]
-          then
-            wget -O miniconda.sh https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
-          else
-            wget -O miniconda.sh https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
-          fi
+          wget -O miniconda.sh https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
           bash miniconda.sh -b -p ${HOME}/miniconda
           export PATH="${HOME}/miniconda/bin:$PATH"
           source ${HOME}/miniconda/etc/profile.d/conda.sh
           conda config --set always_yes yes
           conda install conda-build anaconda-client conda-verify
-          if [ $OS_NAME == "macos-10.15" ]
-          then
-            conda install libiconv libarchive -c conda-forge
-          fi
           conda update -q conda conda-build
           conda update --all
 
-      - name: Setup MacOS
-        if: matrix.os == 'macos-10.15'
-        run: |
-          cd ${HOME}
-          wget https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.15.sdk.tar.xz
-          tar xzf MacOSX10.15.sdk.tar.xz
-          sudo mkdir -p /opt/
-          sudo mv MacOSX10.15.sdk /opt/
-          CONDA_BUILD_SYSROOT=/opt/MacOSX10.15.sdk
-          CONDA_BUILD=1
-          echo "CONDA_BUILD_SYSROOT=$CONDA_BUILD_SYSROOT" >> $GITHUB_ENV
-          echo "CONDA_BUILD=$CONDA_BUILD" >> $GITHUB_ENV
-
       - name: Get Image Information
         id: get_image_info
         env:
@@ -147,12 +124,7 @@ jobs:
           else
               echo ::set-output name=token::$CONDA_UPLOAD_TOKEN_TAG
           fi
-          if [ ${OS_NAME} == "macos-10.15" ]
-          then
-              echo ::set-output name=os::osx-64
-          else
-              echo ::set-output name=os::linux-64
-          fi
+          echo ::set-output name=os::linux-64
 
       - name: Build And Upload
         run: |

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,5 +1,5 @@
 
-Copyright (c) 2022, The Board of Trustees of the Leland Stanford Junior 
+Copyright (c) 2023, The Board of Trustees of the Leland Stanford Junior 
 University, through SLAC National Accelerator Laboratory (subject to receipt 
 of any required approvals from the U.S. Dept. of Energy). All rights reserved. 
 Redistribution and use in source and binary forms, with or without 

diff --git a/setup.py b/setup.py
@@ -6,6 +6,7 @@
 
 # Get version before adding version file
 ver = repo.git.describe('--tags')
+ver = ver.replace('-', '+', 1) # https://github.com/pypa/setuptools/issues/3772
 
 # append version constant to package init
 with open('python/axipcie/__init__.py','a') as vf: