Merge pull request #1070 from slaclab/pre-release

Release Candidate v2.41.0
slaclab · Apr 8, 2023 · db98a64 · db98a64
2 parents f771285 + 9b0fd20
commit db98a64
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 748 deletions.
diff --git a/.github/workflows/surf_ci.yml b/.github/workflows/surf_ci.yml
@@ -125,6 +125,9 @@ jobs:
           export PATH="${HOME}/miniconda/bin:$PATH"
           source ${HOME}/miniconda/etc/profile.d/conda.sh
           conda config --set always_yes yes
+          conda config --set channel_priority strict
+          conda install -n base conda-libmamba-solver
+          conda config --set solver libmamba
           conda install conda-build anaconda-client conda-verify
           conda update -q conda conda-build
           conda update --all
@@ -149,5 +152,5 @@ jobs:
           export PATH="${HOME}/miniconda/bin:$PATH"
           source ${HOME}/miniconda/etc/profile.d/conda.sh
           conda build --debug conda-recipe --output-folder bld-dir -c tidair-tag -c tidair-packages -c conda-forge
-          anaconda -t ${{ steps.get_image_info.outputs.token }} upload --force bld-dir/${{ steps.get_image_info.outputs.os }}/*.tar.bz2
+          anaconda -t ${{ steps.get_image_info.outputs.token }} upload --force bld-dir/noarch/*.tar.bz2
 
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+# EMACS temp files
+*~
+
 # Compiled source files
 *.o
 *.pyc

diff --git a/axi/axi-lite/rtl/AxiVersionLegacy.vhd b/axi/axi-lite/rtl/AxiVersionLegacy.vhd
diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/bash
-  
-python setup.py install
+
+$PYTHON -m pip install .
 
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -7,17 +7,17 @@ source:
 
 build:
    number: {{ GIT_DESCRIBE_NUMBER|int }}
+   noarch: python
 
 requirements:
-   build:
-     - python<3.8
-     - rogue
+
+   host:
+     - python>=3.7
      - git
      - gitpython
-     - numpy
 
    run:
-     - python
+     - python>=3.7
      - rogue
      - numpy