Bug#841081: [pkg-go] Bug#841081: RFP: golang-gopkg-dancannon-gorethink.v1 -- RethinkDB driver for Go

[Potter, Tim (HPE Linux Support)]

On 19 Oct 2016, at 7:02 PM, Guillem Jover  wrote:
> 
> Hi!
> 
> On Wed, 2016-10-19 at 01:40:02 +, Potter, Tim (HPE Linux Support) wrote:
>> On 18 Oct 2016, at 1:21 AM, Guillem Jover  wrote:
>>> Attached a working and tested packaging, where only the ITP bug number
>>> needs to be filled in the debian/changelog. The other patch is required
>>> to get the git repository back to a proper upstream version, because it
>>> was at v2 now.
>> 
>> Which repo were you looking at for the first patch?  The one at 
>> golang-gopkg-dancannon-gorethink.v1
>> was never at v2.  Maybe there was a split into v1 and v2 but that could have
>> happened before my time.
> 
> The repo I was working against was:
> 
> https://anonscm.debian.org/cgit/pkg-go/packages/golang-gopkg-dancannon-gorethink.v1.git
> 
> which does contain an import of the v2 branch version v2.0.1 into the
> v1.4.1 tag. Take a look at commit 1ec608b3e9473da10b35ddfa5afc40a137df6f32
> and you'll see.

Gah - I didn't look to closely at the contents and believed the tags and 
contents
of the changelog.  (-:

I ended up importing the v1.4.1 tarball rather than applying the patch so that 
the
pristine-tar and upstream branches are up to date.

>> The second patch applies just fine.  I pushed it but the remark about
>> changing the build directory to _build that Martin Ferrari made about
>> golang-dns applies here as well.  Technically it could mess up
>> multi-platform builds but I'm not aware of packages that do this.
> 
> My same reply applies here as well, I find it more pleasing to have
> the same directory regardless of the host system, because it makes it
> easier to debug, or instruct people to do so. It certainly should have
> no visible effect to the build machinery, as long as there's no need
> to explicitly point to files underneath the build directory, but I
> think it's still better. But do as you prefer, or your group policies
> dictate, I don't really mind. ;)

I left it as is.

>> I added a missing build-dependency (why does v1 of the package require v2?
>> that's weird) and added a few tweaks.
> 
> It does not depend on v2, the problem is that it *is* v2, but the
> package gets installed as v1 due to the "unmatched" XS-Go-Import-Path
> field, so go cannot find the real module and complains that it's
> missing. The reversion patch really needs to be applied. :) I guess
> having the tag point to the incorrect contents will be confusing, but
> fixing that would require rewriting history. Perhaps in this case it's
> worth it, and instead of the patch, just rebasing and force pushing
> might be better, up to you.

Fixed and uploaded to the NEW queue.


Tim.

> 
> Thanks,
> Guillem



signature.asc
Description: Message signed with OpenPGP using GPGMail

Bug#841081: [pkg-go] Bug#841081: RFP: golang-gopkg-dancannon-gorethink.v1 -- RethinkDB driver for Go

[Guillem Jover]

Hi!

On Wed, 2016-10-19 at 01:40:02 +, Potter, Tim (HPE Linux Support) wrote:
> On 18 Oct 2016, at 1:21 AM, Guillem Jover  wrote:
> > Attached a working and tested packaging, where only the ITP bug number
> > needs to be filled in the debian/changelog. The other patch is required
> > to get the git repository back to a proper upstream version, because it
> > was at v2 now.
> 
> Which repo were you looking at for the first patch?  The one at 
> golang-gopkg-dancannon-gorethink.v1
> was never at v2.  Maybe there was a split into v1 and v2 but that could have
> happened before my time.

The repo I was working against was:

 
https://anonscm.debian.org/cgit/pkg-go/packages/golang-gopkg-dancannon-gorethink.v1.git

which does contain an import of the v2 branch version v2.0.1 into the
v1.4.1 tag. Take a look at commit 1ec608b3e9473da10b35ddfa5afc40a137df6f32
and you'll see.

> The second patch applies just fine.  I pushed it but the remark about
> changing the build directory to _build that Martin Ferrari made about
> golang-dns applies here as well.  Technically it could mess up
> multi-platform builds but I'm not aware of packages that do this.

My same reply applies here as well, I find it more pleasing to have
the same directory regardless of the host system, because it makes it
easier to debug, or instruct people to do so. It certainly should have
no visible effect to the build machinery, as long as there's no need
to explicitly point to files underneath the build directory, but I
think it's still better. But do as you prefer, or your group policies
dictate, I don't really mind. ;)

> I added a missing build-dependency (why does v1 of the package require v2?
> that's weird) and added a few tweaks.

It does not depend on v2, the problem is that it *is* v2, but the
package gets installed as v1 due to the "unmatched" XS-Go-Import-Path
field, so go cannot find the real module and complains that it's
missing. The reversion patch really needs to be applied. :) I guess
having the tag point to the incorrect contents will be confusing, but
fixing that would require rewriting history. Perhaps in this case it's
worth it, and instead of the patch, just rebasing and force pushing
might be better, up to you.

Thanks,
Guillem

Bug#841081: [pkg-go] Bug#841081: RFP: golang-gopkg-dancannon-gorethink.v1 -- RethinkDB driver for Go

[Potter, Tim (HPE Linux Support)]

On 18 Oct 2016, at 1:21 AM, Guillem Jover  wrote:
> 
> Attached a working and tested packaging, where only the ITP bug number
> needs to be filled in the debian/changelog. The other patch is required
> to get the git repository back to a proper upstream version, because it
> was at v2 now.

Which repo were you looking at for the first patch?  The one at 
golang-gopkg-dancannon-gorethink.v1
was never at v2.  Maybe there was a split into v1 and v2 but that could have
happened before my time.

The second patch applies just fine.  I pushed it but the remark about changing
the build directory to _build that Martin Ferrari made about golang-dns applies
here as well.  Technically it could mess up multi-platform builds but I'm not 
aware
of packages that do this.

I added a missing build-dependency (why does v1 of the package require v2?
that's weird) and added a few tweaks.


Tim.

> 
> Thanks,
> Guillem
> <0001-Revert-import-of-v2.0.1-back-to-v1.4.1.patch><0002-Update-packaging.patch>___
> Pkg-go-maintainers mailing list
> pkg-go-maintain...@lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-go-maintainers



signature.asc
Description: Message signed with OpenPGP using GPGMail

Bug#841081: RFP: golang-gopkg-dancannon-gorethink.v1 -- RethinkDB driver for Go

[Guillem Jover]

Package: wnpp
Severity: wishlist
Tags: patch
Control: block 793749 by -1

* Package name: golang-gopkg-dancannon-gorethink.v1
  Version : 1.4.1
  Upstream Author : Daniel Cannon 
* URL : https://github.com/dancannon/gorethink
* License : Apache-2.0
  Programming Lang: Go
  Description : RethinkDB driver for Go

 RethinkDB >= 2.0 compatible driver. The driver uses a connection
 pool at all times, by default it creates and frees connections
 automatically. It's safe for concurrent use by multiple goroutines.


This package is a dependency of telegraf latest upstream releases, it
was already in the archive but got removed due to being unused. See
.


Attached a working and tested packaging, where only the ITP bug number
needs to be filled in the debian/changelog. The other patch is required
to get the git repository back to a proper upstream version, because it
was at v2 now.

Thanks,
Guillem
From a0006f79e905db75aeb673ff08344ba3fc3dfa17 Mon Sep 17 00:00:00 2001
From: Guillem Jover 
Date: Mon, 17 Oct 2016 13:59:45 +0200
Subject: [PATCH 1/2] Revert import of v2.0.1 back to v1.4.1

---
 .travis.yml   |   2 -
 CHANGELOG.md  |  40 
 README.md |  33 +--
 checkers_test.go  |   2 +-
 cluster.go|  43 ++--
 connection.go |  20 +-
 connection_handshake.go   | 450 --
 connection_helper.go  |  55 -
 cursor.go | 262 +++---
 cursor_test.go|  86 
 doc.go|   2 +-
 encoding/encoder_test.go  |  23 --
 encoding/encoder_types.go |  69 ++
 errors.go |   2 +-
 example_query_aggregation_test.go |  30 +--
 gorethink.go  |   2 +-
 gorethink_test.go |   4 +
 node.go   |   2 +-
 pseudotypes.go|   2 +-
 ql2/ql2.pb.go |  15 +-
 ql2/ql2.proto |  15 +-
 query.go  |  28 +--
 query_admin.go|  12 +-
 query_admin_test.go   |  32 +--
 query_aggregation.go  |  44 +---
 query_aggregation_test.go |  41 +---
 query_control.go  |   2 +-
 query_db.go   |   2 +-
 query_geospatial.go   |   2 +-
 query_geospatial_test.go  |   2 +-
 query_join.go |   5 +-
 query_join_test.go|   7 +-
 query_manipulation.go |   2 +-
 query_math.go |   2 +-
 query_select.go   |   2 +-
 query_select_test.go  |  12 +-
 query_string.go   |   2 +-
 query_table.go|   4 +-
 query_table_test.go   |   1 +
 query_test.go |  17 --
 query_time.go |   2 +-
 query_transformation.go   |  23 +-
 query_write.go|   3 +-
 session.go|  11 +-
 session_test.go   |  58 +
 utils.go  |   5 +-
 46 files changed, 270 insertions(+), 1210 deletions(-)
 delete mode 100644 connection_handshake.go

diff --git a/.travis.yml b/.travis.yml
index 342c4db..2870132 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,6 @@ go:
 
 cache: apt
 
-go_import_path: gopkg.in/dancannon/gorethink.v2
-
 before_script:
   - source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list
   - wget -qO- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add -
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d1aaae..0ac94f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,46 +2,6 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## v2.0.1 - 2016-04-14
-
-### Added
- - Added `UnionWithOpts` term which allows `Union` to be called with optional arguments (such as `Interleave`)
- - Added `IncludeOffsets` and `IncludeTypes` optional arguments to `ChangesOpts`
- - Added `Conflict` optional argument to `InsertOpts`
-
-### Fixed
- - Fixed error when connecting to database as non-admin user, please note that `DiscoverHosts` will not work with user authentication at this time due to the fact that RethinkDB restricts access to the required system tables.
-
-## v2.0.0 - 2016-04-13
-
-### Changed
-
- - GoRethink now uses the v1.0 RethinkDB protocol which supports RethinkDB v2.3 and above. If you are using RethinkDB 2.2 or older please set `HandshakeVersion` when creating a session. For example:
-```go
-r.Connect(
-...
-HandshakeVersion: r.HandshakeV0_4,
-...
-)
-```
-
-### Added
- -