Skip to content

Commit

Permalink
wheel name must be scipy-openblas not scipy_openblas
Browse files Browse the repository at this point in the history
  • Loading branch information
mattip committed Feb 5, 2024
1 parent 7556eb1 commit 83955ce
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
fi
if [[ "${INTERFACE64}" != "1" ]]; then
mv local/scipy_openblas64 local/scipy_openblas32
# rewrite the name of the project to scipy_openblas32
# rewrite the name of the project to scipy-openblas32
# this is a hack, but apparently there is no other way to change the name
# of a pyproject.toml project
sed -e "s/openblas64/openblas32/" -i pyproject.toml
Expand Down
5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ requires = [
build-backend = "setuptools.build_meta"

[project]
name = "scipy_openblas64"
version = "0.3.26.0.2"
name = "scipy-openblas64"
version = "0.3.26.0.3"
requires-python = ">=3.7"
description = "Provides OpenBLAS for python packaging"
readme = "README.md"
Expand All @@ -21,6 +21,7 @@ classifiers = [
# ]
# maintainers = [
# ]
license = {file = "LICENSE.txt"}

[project.urls]
homepage = "https://github.com/MacPython/openblas-libs"
Expand Down
2 changes: 1 addition & 1 deletion tools/build_wheel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ if [ "$?" != "0" ]; then
# inside docker
cd /openblas
fi
PYTHON=python3.9
PYTHON=${PYTHON:-python3.9}

mkdir -p local/openblas
mkdir -p dist
Expand Down
15 changes: 12 additions & 3 deletions tools/local_build.sh
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
# Replicate the workflow from posix.yml locally on posix
# This may bitrot, compare it to the original file before using

set -e

# Set extra env
if [ "uname -m" == "x86_64" ]; then
if [[ $(uname -m) == "x86_64" ]]; then
echo got x86_64
export TRAVIS_OS_NAME=ubuntu-latest
export PLAT=x86_64
# export PLAT=i86
DOCKER_TEST_IMAGE=multibuild/xenial_${PLAT}
elif [[ $(uname -m) == arm64 ]]; then
echo got arm64
exit -1
else
echo got nothing
exit -1
export TRAVIS_OS_NAME=osx
export LDFLAGS="-L/Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk/usr/lib"
export LIBRARY_PATH="-L/Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk/usr/lib"
export PLAT=x86_64
# export PLAT=arm64
export SUFFIX=gf_c469a42

fi
export REPO_DIR=OpenBLAS
export OPENBLAS_COMMIT="v0.3.26"
Expand All @@ -32,6 +38,9 @@ function install_virtualenv {
}

function build_openblas {
if [[ -z VIRTUAL_ENV ]]; then
echo "must be run in a virtualenv"
fi
# Build OpenBLAS
set -xeo pipefail
if [ "$PLAT" == "arm64" ]; then
Expand All @@ -56,4 +65,4 @@ function build_openblas {
}

# install_virtualenv
# build_openblas
build_openblas
6 changes: 4 additions & 2 deletions tools/upload_to_anaconda_staging.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@ upload_wheels() {
VERSION=$(git describe --tags --abbrev=8)
popd

# if only rename was built-in to bash...
for f in dist/*.whl; do cp $f "${f/scipy_openblas/scipy-openblas}"; done
if [ "$OPENBLAS_LIBS_STAGING_UPLOAD_TOKEN" != "" ]; then
echo "Uploading OpenBLAS $VERSION to anaconda.org/multibuild-wheels-staging"

anaconda -t $OPENBLAS_LIBS_STAGING_UPLOAD_TOKEN upload \
--no-progress --force -u multibuild-wheels-staging \
dist/scipy_openblas*.whl
dist/scipy-openblas*.whl

fi
if [ "$ANACONDA_SCIENTIFIC_PYTHON_UPLOAD" == "" ]; then
Expand All @@ -28,7 +30,7 @@ upload_wheels() {

anaconda -t $ANACONDA_SCIENTIFIC_PYTHON_UPLOAD upload \
--no-progress --force -u scientific-python-nightly-wheels \
dist/scipy_openblas*.whl
dist/scipy-openblas*.whl

tarballs=$(ls -d builds/openblas*.zip libs/openblas*.tar.gz 2>/dev/null)
anaconda -t $ANACONDA_SCIENTIFIC_PYTHON_UPLOAD upload \
Expand Down

0 comments on commit 83955ce

Please sign in to comment.