summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMohamed Amine Zghal2025-03-29 10:59:38 +0100
committerMohamed Amine Zghal2025-03-29 10:59:38 +0100
commitbbc9ad5a5451b83c9ef895c1a2c4e9aa8c31c9fb (patch)
tree76739c6cd5db1152154c72c0dd8704db86596cfc
parenta9db497cc40442c749e2aa4caea35fc77cdd8ae4 (diff)
downloadaur-bbc9ad5a5451b83c9ef895c1a2c4e9aa8c31c9fb.tar.gz
Update to beta version to fix cassandra-drive tests
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD24
2 files changed, 17 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fa12122fd704..a9aaf2a2b644 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = python-ccm
pkgdesc = Cassandra Cluster Manager.
- pkgver = 3.1.5
- pkgrel = 2
- url = http://github.com/pcmanus/ccm
+ pkgver = 3.1.6.dev3
+ pkgrel = 1
+ url = https://github.com/apache/cassandra-ccm
arch = any
license = Apache-2.0
checkdepends = python-mock
@@ -18,9 +18,7 @@ pkgbase = python-ccm
depends = python-six
depends = python-psutil
optdepends = python-paramiko: Remote execution
- source = https://files.pythonhosted.org/packages/source/c/ccm/ccm-3.1.5.tar.gz
- source = https://download.java.net/openjdk/jdk7u75/ri/jdk_ri-7u75-b13-linux-x64-18_dec_2014.tar.gz
- sha256sums = f07cc0a37116d2ce1b96c0d467f792668aa25835c73beb61639fa50a1954326c
- sha256sums = b58f2666d2233bdb2f31b9370c2f5c89565ebe5f302cba491e3c6848d53b61dd
+ source = https://github.com/apache/cassandra-ccm/archive/refs/tags/cassandra-test.tar.gz
+ sha256sums = c881a62929df353038a088ce8e06996bb93fc2af4a3d9b4551ceb80b95719707
pkgname = python-ccm
diff --git a/PKGBUILD b/PKGBUILD
index ad9ec1d0e2e9..9c7c62743841 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,27 +2,27 @@
_name='ccm'
pkgname=python-${_name}
-pkgver=3.1.5
-pkgrel=2
+pkgver=3.1.6.dev3
+pkgrel=1
pkgdesc="Cassandra Cluster Manager."
-url="http://github.com/pcmanus/ccm"
+url="https://github.com/apache/cassandra-ccm"
arch=('any')
license=('Apache-2.0')
depends=('python' 'python-pyyaml' 'python-six' 'python-psutil')
makedepends=('python-setuptools' 'python-pbr' 'python-build' 'python-installer' 'python-wheel')
checkdepends=('python-mock' 'python-pytest' 'python-requests')
optdepends=('python-paramiko: Remote execution')
-source=("https://files.pythonhosted.org/packages/source/${_name:0:1}/${_name}/${_name}-${pkgver}.tar.gz"
- "https://download.java.net/openjdk/jdk7u75/ri/jdk_ri-7u75-b13-linux-x64-18_dec_2014.tar.gz")
-sha256sums=('f07cc0a37116d2ce1b96c0d467f792668aa25835c73beb61639fa50a1954326c'
- 'b58f2666d2233bdb2f31b9370c2f5c89565ebe5f302cba491e3c6848d53b61dd')
+source=("${url}/archive/refs/tags/cassandra-test.tar.gz")
+sha256sums=('c881a62929df353038a088ce8e06996bb93fc2af4a3d9b4551ceb80b95719707')
prepare(){
- mkdir -p "${srcdir}"/${_name}-${pkgver}/'test-dir'
+ # Fix test
+ cd "${srcdir}"/cassandra-ccm-cassandra-test
+ sed -i 's/assertEquals/assertEqual/g' tests/test_lib.py
}
build() {
- cd "${srcdir}"/${_name}-${pkgver}
+ cd "${srcdir}"/cassandra-ccm-cassandra-test
python -m build --wheel --no-isolation
}
@@ -31,13 +31,13 @@ check() {
-vv
--override-ini="addopts="
)
- cd "${srcdir}"/${_name}-${pkgver}
+ cd "${srcdir}"/cassandra-ccm-cassandra-test
python -m venv --system-site-packages test-env
test-env/bin/python -m installer dist/*.whl
- JAVA_HOME="${srcdir}"/java-se-7u75-ri test-env/bin/python -m pytest "${pytest_options[@]}" tests
+ test-env/bin/python -m pytest "${pytest_options[@]}" tests
}
package() {
- cd "${srcdir}"/${_name}-${pkgver}
+ cd "${srcdir}"/cassandra-ccm-cassandra-test
python -m installer --destdir="$pkgdir" dist/*.whl
}