From 838f6468508cdf9cbcd1b10a9fc9e15ef018a442 Mon Sep 17 00:00:00 2001
From: Talmo Pereira <talmo@princeton.edu>
Date: Thu, 3 Dec 2020 20:14:02 -0500
Subject: [PATCH] Fix build script - Ubuntu: PyPI and conda packages should be
working, testing with wildcard filename - Windows: disable pip package upload
(worked before because it was skipped) - Windows: try build and upload with
powershell
---
.github/workflows/build.yml | 18 +++++++++---------
sleap/version.py | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9c3e7ef8..ac3d566c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -45,16 +45,16 @@ jobs:
which python
conda info
- # Build pip wheel (Windows)
- - name: Build pip wheel
- if: matrix.os == 'windows-latest'
+ # Build pip wheel (Ubuntu)
+ - name: Build pip wheel (Ubuntu)
+ if: matrix.os == 'ubuntu-latest'
shell: bash -l {0}
run: |
python setup.py bdist_wheel
- # Upload pip wheel
- - name: Upload pip wheel (Windows)
- if: matrix.os == 'windows-latest'
+ # Upload pip wheel (Ubuntu)
+ - name: Upload pip wheel (Ubuntu)
+ if: matrix.os == 'ubuntu-latest'
env:
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
shell: bash -l {0}
@@ -86,10 +86,10 @@ jobs:
if: matrix.os == 'windows-latest'
env:
ANACONDA_LOGIN: ${{ secrets.ANACONDA_LOGIN }}
- shell: bash -l {0}
+ shell: powershell
run: |
anaconda login --username sleap --password "$ANACONDA_LOGIN"
- anaconda upload "build\win-64\sleap-1.1.0a4-py36_0.tar.bz2" --label dev
+ anaconda upload "build\win-64\sleap-1.1.0a5-py36_0.tar.bz2" --label dev
anaconda logout
- name: Upload conda package (Ubuntu)
if: matrix.os == 'ubuntu-latest'
@@ -98,5 +98,5 @@ jobs:
shell: bash -l {0}
run: |
anaconda login --username sleap --password "$ANACONDA_LOGIN"
- anaconda upload build/linux-64/sleap-1.1.0a4-py36_0.tar.bz2 --label dev
+ anaconda upload build/linux-64/*.tar.bz2 --label dev
anaconda logout
diff --git a/sleap/version.py b/sleap/version.py
index 9626043b..dac6d758 100644
--- a/sleap/version.py
+++ b/sleap/version.py
@@ -10,4 +10,4 @@ For example, if you set the version to X.Y.Z, then the tag should be "vX.Y.Z".
Must be a semver string, "aN" should be appended for alpha releases.
"""
-__version__ = "1.1.0a4"
+__version__ = "1.1.0a5"
--
GitLab