[Git][clojure-team/cheshire-clojure][debian/main] 6 commits: keep project.clj version strings unmodified in poms
Jérôme Charaoui (@lavamind)
gitlab at salsa.debian.org
Sun Feb 5 06:32:44 GMT 2023
Jérôme Charaoui pushed to branch debian/main at Debian Clojure Maintainers / cheshire-clojure
Commits:
2e53b175 by Jérôme Charaoui at 2023-02-05T00:43:42-05:00
keep project.clj version strings unmodified in poms
- - - - -
4a7fd403 by Jérôme Charaoui at 2023-02-05T01:23:35-05:00
d/rules: re-enable tests, minus one testcase
- - - - -
dda94134 by Jérôme Charaoui at 2023-02-05T01:23:37-05:00
fix jh_classpath
- - - - -
816b0995 by Jérôme Charaoui at 2023-02-05T01:23:38-05:00
d/tests: add autopkgtests
- - - - -
4c3fcb74 by Jérôme Charaoui at 2023-02-05T01:23:38-05:00
Update changelog for 5.11.0-2 release
- - - - -
470bf2e1 by Jérôme Charaoui at 2023-02-05T01:27:48-05:00
maven-fixup
- - - - -
10 changed files:
- debian/changelog
- debian/control
- debian/libcheshire-clojure.classpath
- debian/maven.rules
- + debian/patches/0002-Skip-failing-test.generative-testcase.patch
- debian/patches/series
- debian/rules
- + debian/tests/build
- + debian/tests/control
- + debian/tests/upstream
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+cheshire-clojure (5.11.0-2) unstable; urgency=medium
+
+ * d/tests: add autopkgtests
+ * d/rules: re-enable tests, minus one testcase
+ * keep project.clj version strings unmodified in poms
+ * fix jh_classpath
+
+ -- Jérôme Charaoui <jerome at riseup.net> Sun, 05 Feb 2023 01:16:42 -0500
+
cheshire-clojure (5.11.0-1) unstable; urgency=medium
[ Louis-Philippe Véronneau ]
=====================================
debian/control
=====================================
@@ -11,10 +11,13 @@ Build-Depends:
javahelper,
leiningen,
libclojure-java,
+ libdata-generators-clojure (>= 1.0.0-3) <!nocheck>,
libjackson2-core-java,
libjackson2-dataformat-cbor,
libjackson2-dataformat-smile,
+ libtest-generative-clojure (>= 1.0.0-3) <!nocheck>,
libtigris-clojure,
+ libtools-namespace-clojure <!nocheck>,
maven-repo-helper,
Standards-Version: 4.6.2
Vcs-Git: https://salsa.debian.org/clojure-team/cheshire-clojure.git
=====================================
debian/libcheshire-clojure.classpath
=====================================
@@ -1 +1 @@
-usr/share/cheshire.jar /usr/share/java/clojure.jar /usr/share/java/tigris.jar /usr/share/java/jackson-core.jar /usr/share/java/jackson-dataformat-cbor.jar /usr/share/java/jackson-dataformat-smile.jar
+usr/share/java/cheshire.jar /usr/share/java/clojure.jar /usr/share/java/tigris.jar /usr/share/java/jackson-core.jar /usr/share/java/jackson-dataformat-cbor.jar /usr/share/java/jackson-dataformat-smile.jar
=====================================
debian/maven.rules
=====================================
@@ -1,2 +1,4 @@
-
-* clojure * s/([0-9]+)\.([0-9]+).*/$1.$2.x/ * *
+# with patched project.clj
+# do not apply any version rules
+com.fasterxml.jackson.core * * * *
+com.fasterxml.jackson.dataformat * * * *
=====================================
debian/patches/0002-Skip-failing-test.generative-testcase.patch
=====================================
@@ -0,0 +1,53 @@
+From: Rob Browning <rlb at defaultvalue.org>
+Date: Sun, 5 Feb 2023 00:48:15 -0500
+Subject: Skip failing test.generative testcase
+
+Forwarded: not-needed
+
+---
+ test/cheshire/test/generative.clj | 30 ++++++++++++++++--------------
+ 1 file changed, 16 insertions(+), 14 deletions(-)
+
+diff --git a/test/cheshire/test/generative.clj b/test/cheshire/test/generative.clj
+index 6b6cd7d..fe53457 100644
+--- a/test/cheshire/test/generative.clj
++++ b/test/cheshire/test/generative.clj
+@@ -1,7 +1,9 @@
+ (ns cheshire.test.generative
+- (:use [cheshire.core]
+- [clojure.test.generative]
+- [clojure.test :only [deftest is]]))
++ (:require
++ [cheshire.core :refer :all]
++ [clojure.data.generators]
++ [clojure.test.generative :refer [defspec]]
++ [clojure.test :refer [deftest is]]))
+
+ ;; determines whether generative stuff is printed to stdout
+ (def verbose true)
+@@ -42,14 +44,14 @@
+ [^{:tag (hash-map keyword (hash-map keyword (list int 10) 10) 10)} a]
+ (is (= (first %) (last %))))
+
+-(deftest ^{:generative true} t-generative
+- ;; I want the seeds to change every time, set the number higher if
+- ;; you have more than 16 CPU cores
+- (let [seeds (take 16 (repeatedly #(rand-int 1024)))]
+- (when-not verbose
+- (reset! report-fn identity))
+- (println "Seeds:" seeds)
+- (binding [*msec* 25000
+- *seeds* seeds
+- *verbose* false]
+- (doall (map deref (test-namespaces 'cheshire.test.generative))))))
++;; (deftest ^{:generative true} t-generative
++;; ;; I want the seeds to change every time, set the number higher if
++;; ;; you have more than 16 CPU cores
++;; (let [seeds (take 16 (repeatedly #(rand-int 1024)))]
++;; ;; (when-not verbose
++;; ;; (reset! report-fn identity))
++;; (println "Seeds:" seeds)
++;; (binding [*msec* 25000
++;; *seeds* seeds
++;; *verbose* false]
++;; (doall (map deref (test-namespaces 'cheshire.test.generative))))))
=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
0001-Lein-Local.patch
+0002-Skip-failing-test.generative-testcase.patch
=====================================
debian/rules
=====================================
@@ -21,9 +21,7 @@ override_dh_auto_build:
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- # disabled due to incompatibility with Debian's test.generative
- # reported at https://github.com/dakrone/cheshire/issues/197
- #lein test
+ lein test
endif
override_dh_clean:
=====================================
debian/tests/build
=====================================
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+CLASSPATH=/usr/share/java/cheshire.jar
+
+clojure -cp $CLASSPATH -e '(use '"'"'cheshire.core)'
=====================================
debian/tests/control
=====================================
@@ -0,0 +1,14 @@
+Tests: build
+Depends:
+ clojure,
+ @,
+Restrictions: superficial
+
+Tests: upstream
+Depends:
+ clojure,
+ libbultitude-clojure,
+ libdata-generators-clojure (>= 1.0.0-3),
+ libtest-generative-clojure (>= 1.0.0-3),
+ libtools-namespace-clojure,
+ @,
=====================================
debian/tests/upstream
=====================================
@@ -0,0 +1,19 @@
+#!/bin/sh
+set -efu
+
+CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/bultitude.jar:/usr/share/java/cheshire.jar:test
+
+cp -a test "$AUTOPKGTEST_TMP"
+cd "$AUTOPKGTEST_TMP"
+
+# skip failing testcase due to newer test.generative
+# https://github.com/dakrone/cheshire/issues/197
+rm -f test/cheshire/test/generative.clj
+
+clojure \
+ -cp $CLASSPATH \
+ -e "(require '[clojure.test])" \
+ -e "(require '[bultitude.core :as b])" \
+ -e '(def all-tests (b/namespaces-on-classpath :classpath "test"))' \
+ -e "(map #(require %) all-tests)" \
+ -e '(System/exit (if (clojure.test/successful? (clojure.test/run-all-tests #"cheshire.test\S+")) 0 1))'
View it on GitLab: https://salsa.debian.org/clojure-team/cheshire-clojure/-/compare/2b584a4a360b9c5b15d664729a7a9d87a3cc0c52...470bf2e183a49a6095a92332f704ea63b9ce4545
--
View it on GitLab: https://salsa.debian.org/clojure-team/cheshire-clojure/-/compare/2b584a4a360b9c5b15d664729a7a9d87a3cc0c52...470bf2e183a49a6095a92332f704ea63b9ce4545
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20230205/1bfee526/attachment.htm>
More information about the pkg-java-commits
mailing list