[Git][java-team/libsignatures-java][master] 14 commits: Adding pretty=describe to debian/watch.
Andrius Merkys (@merkys)
gitlab at salsa.debian.org
Tue Nov 9 07:41:35 GMT 2021
Andrius Merkys pushed to branch master at Debian Java Maintainers / libsignatures-java
Commits:
c6d9f29d by Andrius Merkys at 2021-11-08T10:33:44-05:00
Adding pretty=describe to debian/watch.
- - - - -
71b7c4a3 by Andrius Merkys at 2021-11-08T10:35:47-05:00
Adding 'uversionmangle=s/^v//'.
- - - - -
7c401473 by Andrius Merkys at 2021-11-08T10:36:07-05:00
New upstream version 1.1.10.g614270e+ds
- - - - -
dc419701 by Andrius Merkys at 2021-11-08T10:36:11-05:00
Update upstream source from tag 'upstream/1.1.10.g614270e+ds'
Update to upstream version '1.1.10.g614270e+ds'
with Debian dir ed98fb9994cfea55b13a3a80dfd7c660564ef060
- - - - -
9fca5c11 by Andrius Merkys at 2021-11-08T10:38:41-05:00
Dropping no longer needed patch.
- - - - -
683c3c8b by Andrius Merkys at 2021-11-08T10:39:55-05:00
Updating copyright years.
- - - - -
587adcf1 by Andrius Merkys at 2021-11-08T10:40:12-05:00
Dropping boilerplate debian/README.source.
- - - - -
c391f0ae by Andrius Merkys at 2021-11-08T10:40:48-05:00
Removing empty files from debian/.
- - - - -
7d77ad10 by Andrius Merkys at 2021-11-08T10:41:04-05:00
Bumping debhelper-compat (no changes).
- - - - -
47fb8587 by Andrius Merkys at 2021-11-08T10:46:38-05:00
Fixing junit POM patching rules.
- - - - -
07c1cdba by Andrius Merkys at 2021-11-09T01:36:11-05:00
Update changelog for 1.1.10.g614270e+ds-1 release
- - - - -
1736675f by Andrius Merkys at 2021-11-09T01:44:58-05:00
Removing src/main/java/module-info.java to fix build.
- - - - -
49edcb6a by Andrius Merkys at 2021-11-09T01:45:26-05:00
Ending debian/rules with a newline.
- - - - -
8c7c6393 by Andrius Merkys at 2021-11-09T01:46:06-05:00
Update changelog for 1.1.10.g614270e+ds-1 release
- - - - -
19 changed files:
- − debian/README.source
- debian/changelog
- debian/control
- debian/copyright
- − debian/maven.cleanIgnoreRules
- − debian/maven.publishedRules
- debian/maven.rules
- + debian/patches/fix-JAR-assembly.patch
- − debian/patches/ignore-failing-tests.patch
- debian/patches/series
- debian/rules
- debian/watch
- pom.xml
- + src/main/java/module-info.java
- src/test/java/signature/DAGTester.java
- src/test/java/signature/HeightTest.java
- − src/test/java/signature/display/TestColoredTreePanel.java
- − src/test/java/signature/display/TestMultipleTrees.java
- src/test/java/signature/simple/CanonicalLabellingTest.java
Changes:
=====================================
debian/README.source deleted
=====================================
@@ -1,9 +0,0 @@
-Information about libsignatures-java
-------------------------------------
-
-This package was debianized using the mh_make command
-from the maven-debian-helper package.
-
-The build system uses Maven but prevents it from downloading
-anything from the Internet, making the build compliant with
-the Debian policy.
=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+libsignatures-java (1.1.10.g614270e+ds-1) unstable; urgency=medium
+
+ * Adding pretty=describe to debian/watch.
+ * New upstream version 1.1.10.g614270e+ds
+ * Dropping no longer needed patch.
+ * Updating copyright years.
+ * Dropping boilerplate debian/README.source.
+ * Removing empty files from debian/.
+ * Bumping debhelper-compat (no changes).
+ * Fixing junit POM patching rules.
+ * Removing src/main/java/module-info.java to fix build.
+ * Ending debian/rules with a newline.
+
+ -- Andrius Merkys <merkys at debian.org> Tue, 09 Nov 2021 01:45:43 -0500
+
libsignatures-java (0.0~git20141229.14f3045+ds-2) unstable; urgency=medium
* Adding 'Rules-Requires-Root: no'.
=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
Uploaders:
Andrius Merkys <merkys at debian.org>,
Build-Depends:
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
default-jdk,
maven-debian-helper (>= 2.1),
Build-Depends-Indep:
=====================================
debian/copyright
=====================================
@@ -5,11 +5,11 @@ Files-Excluded:
lib
Files: *
-Copyright: 2009-2019, Lars Carlsson and Gilleain Torrance
+Copyright: 2009-2020, Lars Carlsson and Gilleain Torrance
License: Expat
Files: debian/*
-Copyright: 2019, Andrius Merkys <merkys at debian.org>
+Copyright: 2019-2021, Andrius Merkys <merkys at debian.org>
License: Expat
License: Expat
=====================================
debian/maven.cleanIgnoreRules deleted
=====================================
@@ -1 +0,0 @@
-
=====================================
debian/maven.publishedRules deleted
=====================================
@@ -1 +0,0 @@
-
=====================================
debian/maven.rules
=====================================
@@ -1,3 +1,2 @@
-
com.github.gilleain.signatures signatures jar s/.*/debian/ * *
-junit junit jar s/4\..*/4.x/ * *
+junit junit jar s/.*/4.x/ * *
=====================================
debian/patches/fix-JAR-assembly.patch
=====================================
@@ -0,0 +1,17 @@
+Description: Remove module-info.java file which fails maven-jar-plugin.
+Author: Andrius Merkys <merkys at debian.org>
+Forwarded: not-needed
+--- a/src/main/java/module-info.java
++++ /dev/null
+@@ -1,10 +0,0 @@
+-module signatures {
+- exports signature;
+- exports signature.chemistry;
+- exports signature.edgecolored;
+-
+- requires java.desktop;
+-
+- // remove this for maven!!
+-// requires junit;
+-}
+\ No newline at end of file
=====================================
debian/patches/ignore-failing-tests.patch deleted
=====================================
@@ -1,20 +0,0 @@
-Description: Ignore a failing test.
-Author: Andrius Merkys <merkys at debian.org>
---- a/src/test/java/signature/simple/CanonicalLabellingTest.java
-+++ b/src/test/java/signature/simple/CanonicalLabellingTest.java
-@@ -7,6 +7,7 @@
-
- import junit.framework.Assert;
-
-+import org.junit.Ignore;
- import org.junit.Test;
-
- import signature.SymmetryClass;
-@@ -102,6 +103,7 @@
- }
- }
-
-+ @Ignore("Fails")
- @Test
- public void isomorphicPair() {
- SimpleGraph a = new SimpleGraph("5:7,6:7,0:6,1:6,2:5,3:5,0:4,1:4,2:4,3:4,0:3,2:3,0:1,1:2");
=====================================
debian/patches/series
=====================================
@@ -1 +1 @@
-ignore-failing-tests.patch
+fix-JAR-assembly.patch
=====================================
debian/rules
=====================================
@@ -1,4 +1,4 @@
#!/usr/bin/make -f
%:
- dh $@
\ No newline at end of file
+ dh $@
=====================================
debian/watch
=====================================
@@ -1,3 +1,3 @@
version=4
-opts="mode=git,repack,repacksuffix=+ds,dversionmangle=s/\+ds//" \
+opts="mode=git,repack,repacksuffix=+ds,dversionmangle=auto,pretty=describe,uversionmangle=s/^v//" \
https://github.com/gilleain/signatures HEAD
=====================================
pom.xml
=====================================
@@ -21,7 +21,7 @@
<developerConnection>scm:git:git at github.com:gilleain/signatures.git</developerConnection>
</scm>
<issueManagement>
- <url>https://github.com/johnmay/beam/issues</url>
+ <url>https://github.com/gilleain/signatures/issues</url>
<system>GitHub Issues</system>
</issueManagement>
<distributionManagement>
@@ -46,10 +46,11 @@
<testSourceDirectory>src/test/java</testSourceDirectory>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <release>9</release>
</configuration>
</plugin>
<plugin>
@@ -149,8 +150,8 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
+ <version>[4.13.1,)</version>
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
=====================================
src/main/java/module-info.java
=====================================
@@ -0,0 +1,10 @@
+module signatures {
+ exports signature;
+ exports signature.chemistry;
+ exports signature.edgecolored;
+
+ requires java.desktop;
+
+ // remove this for maven!!
+// requires junit;
+}
\ No newline at end of file
=====================================
src/test/java/signature/DAGTester.java
=====================================
@@ -42,23 +42,24 @@ public class DAGTester {
ring.addRelation(child6, child3);
System.out.println(ring);
- String[] labels = new String[] { "C", "C", "C"};
- ring.initializeWithStringLabels(labels);
-
- ring.updateNodeInvariants(DAG.Direction.UP);
- System.out.println(ring.copyInvariants());
-
- ring.computeVertexInvariants();
- System.out.println(ring.copyInvariants());
-
- ring.updateNodeInvariants(DAG.Direction.DOWN);
- System.out.println(ring.copyInvariants());
-
- ring.computeVertexInvariants();
- System.out.println(ring.copyInvariants());
-
- ring.updateVertexInvariants();
- System.out.println(ring.copyInvariants());
+//
+// String[] labels = new String[] { "C", "C", "C"};
+// ring.initializeWithStringLabels(labels);
+//
+// ring.updateNodeInvariants(DAG.Direction.UP);
+// System.out.println(ring.copyInvariants());
+//
+// ring.computeVertexInvariants();
+// System.out.println(ring.copyInvariants());
+//
+// ring.updateNodeInvariants(DAG.Direction.DOWN);
+// System.out.println(ring.copyInvariants());
+//
+// ring.computeVertexInvariants();
+// System.out.println(ring.copyInvariants());
+//
+// ring.updateVertexInvariants();
+// System.out.println(ring.copyInvariants());
// List<Integer> orbit = ring.createOrbit();
// System.out.println(orbit);
@@ -97,15 +98,16 @@ public class DAGTester {
DAG.Node childD = dag.makeNodeInLayer(1, 2);
dag.addRelation(childD, childB);
- System.out.println(dag);
+// System.out.println(dag);
dag.initializeWithStringLabels(new String[] {"C", "C"});
-
- dag.updateVertexInvariants();
- System.out.println(dag.copyInvariants());
-
- dag.setColor(1, 1);
- dag.updateVertexInvariants();
- System.out.println(dag.copyInvariants());
+//
+ // TODO : test fails at this point
+// dag.updateVertexInvariants();
+// System.out.println(dag.copyInvariants());
+//
+// dag.setColor(1, 1);
+// dag.updateVertexInvariants();
+// System.out.println(dag.copyInvariants());
}
@Test
@@ -140,31 +142,32 @@ public class DAGTester {
testInvariants(
nodeInvariants, vertexInvariants, simpleDAG.copyInvariants());
- simpleDAG.updateNodeInvariants(DAG.Direction.DOWN);
- int [] nodeInvariantsAfterDown = {1, 0, 0};
- int [] vertexInvariantsAfterDown = {1, 2, 2};
- testInvariants(nodeInvariantsAfterDown,
- vertexInvariantsAfterDown,
- simpleDAG.copyInvariants());
-
- simpleDAG.computeVertexInvariants();
- int [] nodeInvariantsAfterComputeVertexInv = {1, 0, 0};
- int [] vertexInvariantsAfterComputeVertexInv = {2, 1, 1};
- testInvariants(nodeInvariantsAfterComputeVertexInv,
- vertexInvariantsAfterComputeVertexInv,
- simpleDAG.copyInvariants());
-
- simpleDAG.updateNodeInvariants(DAG.Direction.UP);
- int [] nodeInvariantsAfterUp = {1, 1, 1};
- int [] vertexInvariantsAfterUp = {2, 1, 1};
- testInvariants(nodeInvariantsAfterUp,
- vertexInvariantsAfterUp,
- simpleDAG.copyInvariants());
-
- String simpleDAGString = simpleDAG.toString();
- String expected = "[0 Node ([], [1,2])]\n[1 Node ([0], []), " +
- "2 Node ([0], [])]\n";
- Assert.assertEquals(expected,simpleDAGString);
+ // TODO - test fails at this point!
+// simpleDAG.updateNodeInvariants(DAG.Direction.DOWN);
+// int [] nodeInvariantsAfterDown = {1, 0, 0};
+// int [] vertexInvariantsAfterDown = {1, 2, 2};
+// testInvariants(nodeInvariantsAfterDown,
+// vertexInvariantsAfterDown,
+// simpleDAG.copyInvariants());
+
+// simpleDAG.computeVertexInvariants();
+// int [] nodeInvariantsAfterComputeVertexInv = {1, 0, 0};
+// int [] vertexInvariantsAfterComputeVertexInv = {2, 1, 1};
+// testInvariants(nodeInvariantsAfterComputeVertexInv,
+// vertexInvariantsAfterComputeVertexInv,
+// simpleDAG.copyInvariants());
+//
+// simpleDAG.updateNodeInvariants(DAG.Direction.UP);
+// int [] nodeInvariantsAfterUp = {1, 1, 1};
+// int [] vertexInvariantsAfterUp = {2, 1, 1};
+// testInvariants(nodeInvariantsAfterUp,
+// vertexInvariantsAfterUp,
+// simpleDAG.copyInvariants());
+//
+// String simpleDAGString = simpleDAG.toString();
+// String expected = "[0 Node ([], [1,2])]\n[1 Node ([0], []), " +
+// "2 Node ([0], [])]\n";
+// Assert.assertEquals(expected,simpleDAGString);
}
@Test
@@ -190,34 +193,35 @@ public class DAGTester {
// Initialize the all invariants.
simpleDAG.initializeWithStringLabels(new String[] {"Node0", "Node2", "Node1"});
- //System.out.println(simpleDAG.toString());
+// //System.out.println(simpleDAG.toString());
- // Canonize DAG by a simple Hopcroft-Tarjan sweep.
+// // Canonize DAG by a simple Hopcroft-Tarjan sweep.
int [] nodeInvariants = {0, 0, 0};
int [] vertexInvariants = {1, 3, 2};
testInvariants(
nodeInvariants, vertexInvariants, simpleDAG.copyInvariants());
- simpleDAG.updateNodeInvariants(DAG.Direction.DOWN);
- int [] nodeInvariantsAfterDown = {1, 0, 0};
- int [] vertexInvariantsAfterDown = {1, 3, 2};
- testInvariants(nodeInvariantsAfterDown,
- vertexInvariantsAfterDown,
- simpleDAG.copyInvariants());
-
- simpleDAG.computeVertexInvariants();
- int [] nodeInvariantsAfterComputeVertexInv = {1, 0, 0};
- int [] vertexInvariantsAfterComputeVertexInv = {2, 1, 1};
- testInvariants(nodeInvariantsAfterComputeVertexInv,
- vertexInvariantsAfterComputeVertexInv,
- simpleDAG.copyInvariants());
-
- simpleDAG.updateNodeInvariants(DAG.Direction.UP);
- int [] nodeInvariantsAfterUp = {1, 1, 1};
- int [] vertexInvariantsAfterUp = {2, 1, 1};
- testInvariants(nodeInvariantsAfterUp,
- vertexInvariantsAfterUp,
- simpleDAG.copyInvariants());
+ // TODO - test fails at this point
+// simpleDAG.updateNodeInvariants(DAG.Direction.DOWN);
+// int [] nodeInvariantsAfterDown = {1, 0, 0};
+// int [] vertexInvariantsAfterDown = {1, 3, 2};
+// testInvariants(nodeInvariantsAfterDown,
+// vertexInvariantsAfterDown,
+// simpleDAG.copyInvariants());
+//
+// simpleDAG.computeVertexInvariants();
+// int [] nodeInvariantsAfterComputeVertexInv = {1, 0, 0};
+// int [] vertexInvariantsAfterComputeVertexInv = {2, 1, 1};
+// testInvariants(nodeInvariantsAfterComputeVertexInv,
+// vertexInvariantsAfterComputeVertexInv,
+// simpleDAG.copyInvariants());
+//
+// simpleDAG.updateNodeInvariants(DAG.Direction.UP);
+// int [] nodeInvariantsAfterUp = {1, 1, 1};
+// int [] vertexInvariantsAfterUp = {2, 1, 1};
+// testInvariants(nodeInvariantsAfterUp,
+// vertexInvariantsAfterUp,
+// simpleDAG.copyInvariants());
}
@Test
=====================================
src/test/java/signature/HeightTest.java
=====================================
@@ -70,7 +70,7 @@ public class HeightTest {
}
}
- @Test
+// @Test
public void torusTest() {
int width = 6;
int height = 6;
=====================================
src/test/java/signature/display/TestColoredTreePanel.java deleted
=====================================
@@ -1,48 +0,0 @@
-package signature.display;
-
-import java.awt.Dimension;
-import java.awt.GridLayout;
-
-import javax.swing.JFrame;
-
-import junit.framework.Assert;
-
-import org.junit.Test;
-
-
-import signature.ColoredTree;
-import signature.chemistry.AtomSignature;
-
-public class TestColoredTreePanel {
-
- @Test
- public void dummyTest() {
- Assert.assertTrue(true);
- }
-
- public static ColoredTree makeColoredTree(String signatureString) {
- return AtomSignature.parse(signatureString);
- }
-
- /**
- * @param args
- */
- public static void main(String[] args) {
- JFrame f = new JFrame();
- int width = 1200;
- int height = 350;
- f.setLayout(new GridLayout(2, 1));
- String sigA = "[C]([C]([C,2][C]([C,1]([C,3])[C,4]([C,5])))[C]([C]([C,4]"
- + "[C,3])[C]([C,1][C,5]))[C,2]([C]([C,5][C,3])))";
- String sigB = "[C]([C]([C]([C,1]([C,2])[C,3])[C]([C,4][C,5]))[C]([C,4]"
- + "([C,2])[C,3]([C,5]))[C]([C]([C,1][C,2])[C,5]))";
- ColoredTree a = TestColoredTreePanel.makeColoredTree(sigA);
- ColoredTree b = TestColoredTreePanel.makeColoredTree(sigB);
- f.add(new ColoredTreePanel(a, width, height));
- f.add(new ColoredTreePanel(b, width, height));
- f.setPreferredSize(new Dimension(width,2*height));
- f.pack();
- f.setVisible(true);
- }
-
-}
=====================================
src/test/java/signature/display/TestMultipleTrees.java deleted
=====================================
@@ -1,58 +0,0 @@
-package signature.display;
-
-import java.awt.Dimension;
-import java.awt.GridLayout;
-
-import javax.swing.JFrame;
-
-import junit.framework.Assert;
-
-import org.junit.Test;
-
-import signature.ColoredTree;
-import signature.chemistry.AtomSignature;
-import signature.chemistry.Molecule;
-import signature.chemistry.MoleculeSignature;
-
-public class TestMultipleTrees {
-
- @Test
- public void dummyTest() {
- Assert.assertTrue(true);
- }
-
- public static void makePanel(JFrame f, String signature, int w, int h) {
- ColoredTree tree = AtomSignature.parse(signature);;
- f.add(new ColoredTreePanel(tree, w, h));
- }
-
- /**
- * @param args
- */
- public static void main(String[] args) {
- JFrame f = new JFrame();
- int width = 200;
- int height = 300;
- Molecule molecule = new Molecule();
- molecule.addAtom("C");
- molecule.addAtom("H");
- molecule.addAtom("N");
- molecule.addAtom("O");
- molecule.addAtom("P");
- molecule.addAtom("S");
- molecule.addSingleBond(0, 1);
- molecule.addSingleBond(0, 2);
- molecule.addSingleBond(2, 3);
- molecule.addSingleBond(2, 4);
- molecule.addSingleBond(3, 5);
-
- f.setLayout(new GridLayout(1, 6));
- MoleculeSignature molSig = new MoleculeSignature(molecule);
- for (String signature : molSig.getVertexSignatureStrings()) {
- TestMultipleTrees.makePanel(f, signature, width, height);
- }
- f.setPreferredSize(new Dimension(6 * width, height));
- f.pack();
- f.setVisible(true);
- }
-}
=====================================
src/test/java/signature/simple/CanonicalLabellingTest.java
=====================================
@@ -7,6 +7,7 @@ import java.util.Set;
import junit.framework.Assert;
+import org.junit.Ignore;
import org.junit.Test;
import signature.SymmetryClass;
@@ -19,7 +20,7 @@ public class CanonicalLabellingTest {
}
public void permuteTest(SimpleGraph graph) {
- System.out.println(Arrays.toString(getLabels(graph)) + " " + graph);
+// System.out.println(Arrays.toString(getLabels(graph)) + " " + graph);
SimpleGraphPermutor permutor = new SimpleGraphPermutor(graph);
Set<String> relabelledStrings = new HashSet<String>();
@@ -29,18 +30,19 @@ public class CanonicalLabellingTest {
int[] labels = getLabels(permutation);
SimpleGraph relabelled = new SimpleGraph(permutation, labels);
boolean isIdentity = isIdentity(labels);
- System.out.println(
- Arrays.toString(labels) + " " + permutation + " " + relabelled
- + " " + isIdentity);
+// System.out.println(
+// Arrays.toString(labels) + " " + permutation + " " + relabelled
+// + " " + isIdentity);
relabelledStrings.add(relabelled.toString());
}
Assert.assertEquals(1, relabelledStrings.size());
// list the number of unique strings
Iterator<String> values = relabelledStrings.iterator();
- for (int i = 0; i < relabelledStrings.size(); i++) {
- System.out.println(i + " " + values.next());
- }
+ // TODO - this is not a test!
+// for (int i = 0; i < relabelledStrings.size(); i++) {
+// System.out.println(i + " " + values.next());
+// }
}
public boolean isIdentity(int[] permutation) {
@@ -103,6 +105,7 @@ public class CanonicalLabellingTest {
}
@Test
+ @Ignore
public void isomorphicPair() {
SimpleGraph a = new SimpleGraph("5:7,6:7,0:6,1:6,2:5,3:5,0:4,1:4,2:4,3:4,0:3,2:3,0:1,1:2");
SimpleGraph b = new SimpleGraph("5:7,6:7,0:6,2:6,1:5,3:5,0:4,1:4,2:4,3:4,0:3,1:3,0:2,1:2");
View it on GitLab: https://salsa.debian.org/java-team/libsignatures-java/-/compare/3ea2157cc45f378da1dd5be530c43d1a40cc5e54...8c7c6393c392f4d99c93713d9eaa4a13d8e9c590
--
View it on GitLab: https://salsa.debian.org/java-team/libsignatures-java/-/compare/3ea2157cc45f378da1dd5be530c43d1a40cc5e54...8c7c6393c392f4d99c93713d9eaa4a13d8e9c590
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/20211109/9dd604ae/attachment.htm>
More information about the pkg-java-commits
mailing list