Merge pull request #102 from DiamondLightSource/version-from-tag

Version from tag

.github/workflows/conda_upload.yml

@@ -1,12 +1,10 @@
 name: httomolibgpu conda upload
 
+# Run the workflow whenever a tag beginning with `v` is pushed to any branch
 on:
   push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
+    tags:
+      - v*
 
 jobs:
   build-linux:
@@ -18,7 +16,10 @@ jobs:
 
     steps:
       - name: Checkout repository code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          ref: ${{ github.ref_name }}
 
       # setup Python 3.9
       - name: Setup Python 3.9
@@ -39,6 +40,8 @@ jobs:
           LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 
       - name: Build and upload the package to httomo conda cloud
+        env:
+          LABEL: main
         run: |
           chmod +x ./.scripts/conda_upload.sh
-          ./.scripts/conda_upload.sh
+          ./.scripts/conda_upload.sh

.github/workflows/nightly_build.yml

@@ -0,0 +1,40 @@
+name: httomolibgpu nightly dev conda package build + upload
+
+on:
+  schedule:
+    # Run at midnight every day
+    - cron: '0 0 * * *'
+
+jobs:
+  build-linux:
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        shell: bash -l {0}
+
+    steps:
+      - name: Checkout repository code
+        uses: actions/checkout@v3
+        with:
+          ref: "main"
+          fetch-depth: 0
+
+      # setup Python 3.9
+      - name: Setup Python 3.9
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+
+      - name: Decrypt a secret
+        run: ./.scripts/decrypt_secret.sh
+        env:
+          LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
+
+      - name: Build and upload the package to httomo conda cloud
+        env:
+          LABEL: dev
+        run: |
+          chmod +x ./.scripts/conda_upload.sh
+          ./.scripts/conda_upload.sh
+

.gitignore

@@ -45,3 +45,9 @@ cov.xml
 .pytest_cache/
 .mypy_cache/
 save_to_images
+
+# These are files that are created during the conda build process that need to
+# be ignored in order to avoid builds being marked as being in a "dirty" state
+build_env_setup.sh
+conda_build.sh
+metadata_conda_debug.yaml

.scripts/conda_upload.sh

@@ -25,5 +25,5 @@ $CONDA/bin/conda build . -c conda-forge -c httomo -c astra-toolbox --no-test
 find $CONDA_BLD_PATH/$OS -name *.tar.bz2 | while read file
 do
     echo $file
-    $CONDA/bin/anaconda -v --show-traceback --token $CONDA_TOKEN upload $file --force
+    $CONDA/bin/anaconda -v --show-traceback --token $CONDA_TOKEN upload --label $LABEL $file --force
 done

conda/recipe/conda_build_config.yaml

@@ -1,4 +1,5 @@
 python:
+  - 3.9
   - 3.10
 numpy:
   - 1.24

conda/recipe/meta.yaml

@@ -1,11 +1,10 @@
 {% set pyproject = load_file_data("../../pyproject.toml", from_recipe_dir=True) %}
 {% set proj = pyproject.get("project") %}
 {% set name = proj.get("name") %}
-{% set version = proj.get("version") %}
 
 package:
   name: {{ name|lower }}
-  version: {{ version }}
+  version: {{ GIT_DESCRIBE_TAG|trim("v") }}
 
 source:
   path: ../../
@@ -19,6 +18,7 @@ requirements:
     - python
     - pip
     - setuptools
+    - setuptools-git-versioning
   run:
     - python
     - numpy

pyproject.toml

@@ -15,6 +15,8 @@ httomolibgpu = ["*.cu", "*.cuh"]    # include cuda kernels in package
 
 [tool.setuptools-git-versioning]
 enabled = true
+template = "{tag}"
+dev_template = "{tag}"
 
 [project]
 name = "httomolibgpu"