diff --git a/.gitignore b/.gitignore index e3255ef..73528f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,9 @@ /azure-batch-10.0.0.zip /azure-batch-11.0.0.zip /azure-batch-12.0.0.zip +/azure-batch-12.0.0.tgz +/azure-batch-13.0.0.zip +/azure-batch-14.0.0.zip +/azure-batch-14.1.0.tar.gz +/azure-batch-14.2.0.tar.gz +/azure_batch-15.0.0b1.tar.gz diff --git a/generate-source.sh b/generate-source.sh new file mode 100755 index 0000000..8f106d0 --- /dev/null +++ b/generate-source.sh @@ -0,0 +1,25 @@ +#!/bin/bash +set -euxo pipefail + +export VERSION=12.0.0 +export PACKAGE_NAME=azure-batch +WORKING_DIR=$(pwd) + +# Download the release and unpack it. +curl -LO https://github.com/Azure/azure-sdk-for-python/archive/refs/tags/${PACKAGE_NAME}_${VERSION}.tar.gz +tar xzf ${PACKAGE_NAME}_${VERSION}.tar.gz + +# Find the package directory in the SDK release and the parent directory. +PACKAGE_DIR=$(find azure-sdk-for-python-${PACKAGE_NAME}_${VERSION} -type d -name $PACKAGE_NAME) +PARENT_DIR=$(dirname $PACKAGE_DIR) + +# Build a tarball with a prefix directory that contains the package name and +# version. Store that in the directory where the script is running. +pushd $PARENT_DIR + tar --transform "s/^${PACKAGE_NAME}/${PACKAGE_NAME}-${VERSION}/" -cz \ + -f ${WORKING_DIR}/${PACKAGE_NAME}-${VERSION}.tgz $PACKAGE_NAME +popd + +# Clean up. +rm -f tar xzf ${PACKAGE_NAME}_${VERSION}.tar.gz +rm -rf azure-sdk-for-python-${PACKAGE_NAME}_${VERSION} \ No newline at end of file diff --git a/python-azure-batch.spec b/python-azure-batch.spec index 60f4e20..1746fc5 100644 --- a/python-azure-batch.spec +++ b/python-azure-batch.spec @@ -1,16 +1,17 @@ -# NOTE(mhayden): The tests require network access to talk to some Azure -# endpoints, so the tests are disabled for now. 😞 +# NOTE(mhayden): Upstream removed VCR cassettes required for tests 😢 %bcond_with tests %global srcname azure-batch +%global tarball_name azure_batch Name: python-%{srcname} -Version: 12.0.0 +Version: 15.0.0~b1 +%global pypi_version 15.0.0b1 Release: %autorelease Summary: Microsoft Azure Batch Client Library for Python License: MIT URL: https://pypi.org/project/%{srcname}/ -Source0: %{pypi_source %{srcname} %{version} zip} +Source0: %{pypi_source %{tarball_name} %{pypi_version}} BuildArch: noarch @@ -24,6 +25,7 @@ BuildRequires: python3dist(azure-mgmt-resource) BuildRequires: python3dist(azure-sdk-tools) BuildRequires: python3dist(pytest) BuildRequires: python3dist(pytest-aiohttp) +BuildRequires: python3dist(python-dotenv) %endif %global _description %{expand: @@ -34,17 +36,16 @@ Microsoft Azure Batch Client Library for Python} %package -n python3-%{srcname} Summary: %{summary} -Obsoletes: python3-azure-sdk < 5.0.1 %description -n python3-%{srcname} %{_description} %prep -%autosetup -n %{srcname}-%{version} +%autosetup -n %{tarball_name}-%{pypi_version} %generate_buildrequires -%pyproject_buildrequires -r +%pyproject_buildrequires %build @@ -56,9 +57,11 @@ Obsoletes: python3-azure-sdk < 5.0.1 %pyproject_save_files azure -%if %{with tests} %check -%pytest --disable-warnings +%pyproject_check_import + +%if %{with tests} +%pytest %endif diff --git a/sources b/sources index d450352..62c3158 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (azure-batch-12.0.0.zip) = 65e2f0af942baf28fec2219e906ef776d032128bba8b1d062e984e632eb73c2807846510c7d248e5609121cd8e338ea0c56dcbd2ba448bba86cb33c79396ddfa +SHA512 (azure_batch-15.0.0b1.tar.gz) = 7f72aaf98c3f3f9602bbeb0a6c3a0e5a27d1d1d3159e1b99f83ab404fe007e4baa3860e92278029c222a040a434305e11a61d790e960c15720bc1bbf39e9f4fe