Skip to content

Commit 8a9fcb8

Browse files
author
Dean Karn
committed
fix go modules + imports
1 parent e6413d2 commit 8a9fcb8

File tree

16 files changed

+41
-47
lines changed

16 files changed

+41
-47
lines changed

‎.travis.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: go
22
go:
3-
- 1.12.5
3+
- 1.13.4
44
- tip
55
matrix:
66
allow_failures:
@@ -15,13 +15,12 @@ notifications:
1515
before_install:
1616
- go get -u github.com/go-playground/overalls
1717
- go get -u github.com/mattn/goveralls
18-
- curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.16.0
1918

2019
script:
2120
- make test
22-
- ./bin/golangci-lint run
21+
- make lint
2322

2423
after_success: |
25-
[ $TRAVIS_GO_VERSION = 1.12.5 ] &&
24+
[ $TRAVIS_GO_VERSION = 1.13.4 ] &&
2625
overalls -project="github.com/go-playground/pure" -covermode=count -ignore=.git,examples -debug &&
2726
goveralls -coverprofile=overalls.coverprofile -service travis-ci -repotoken $COVERALLS_TOKEN

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ GOCMD=GO111MODULE=on go
33
linters-install:
44
@golangci-lint --version >/dev/null 2>&1 || { \
55
echo "installing linting tools..."; \
6-
$(GOCMD) get github.com/golangci/golangci-lint/cmd/golangci-lint; \
6+
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s v1.21.0; \
77
}
88

99
lint: linters-install
10-
golangci-lint run
10+
$(PWD)/bin/golangci-lint run
1111

1212
test:
1313
$(GOCMD) test -cover -race ./...

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package pure
22
============
3-
<img align="right" src="https://raw.githubusercontent.com/go-playground/pure/master/logo.png">![Project status](https://img.shields.io/badge/version-5.0.3-green.svg)
3+
<img align="right" src="https://raw.githubusercontent.com/go-playground/pure/master/logo.png">![Project status](https://img.shields.io/badge/version-5.0.4-green.svg)
44
[![Build Status](https://travis-ci.org/go-playground/pure.svg?branch=master)](https://travis-ci.org/go-playground/pure)
55
[![Coverage Status](https://coveralls.io/repos/github/go-playground/pure/badge.svg?branch=master)](https://coveralls.io/github/go-playground/pure?branch=master)
66
[![Go Report Card](https://goreportcard.com/badge/github.com/go-playground/pure)](https://goreportcard.com/report/github.com/go-playground/pure)
@@ -11,7 +11,7 @@ package pure
1111
Pure is a fast radix-tree based HTTP router that sticks to the native implementations of Go's "net/http" package;
1212
in essence, keeping the handler implementations 'pure' by using Go 1.7's "context" package.
1313

14-
This makes heavy usage of `github.com/go-playground/pkg` for HTTP abstractions.
14+
This makes heavy usage of `github.com/go-playground/pkg/v4` for HTTP abstractions.
1515

1616
Why Another HTTP Router?
1717
------------------------
@@ -28,7 +28,7 @@ Installation
2828
Use go get
2929

3030
```shell
31-
go get -u github.com/go-playground/pure
31+
go get -u github.com/go-playground/pure/v5
3232
```
3333

3434
Usage
@@ -39,8 +39,8 @@ package main
3939
import (
4040
"net/http"
4141

42-
"github.com/go-playground/pure"
43-
mw "github.com/go-playground/pure/_examples/middleware/logging-recovery"
42+
"github.com/go-playground/pure/v5"
43+
mw "github.com/go-playground/pure/v5/_examples/middleware/logging-recovery"
4444
)
4545

4646
func main() {

‎_examples/basic/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package main
33
import (
44
"net/http"
55

6-
"github.com/go-playground/pure"
7-
mw "github.com/go-playground/pure/_examples/middleware/logging-recovery"
6+
"github.com/go-playground/pure/v5"
7+
mw "github.com/go-playground/pure/v5/_examples/middleware/logging-recovery"
88
)
99

1010
func main() {

‎_examples/middleware/logging-recovery/logging_recovery.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"time"
1111

1212
"github.com/go-playground/ansi"
13-
"github.com/go-playground/pure"
13+
"github.com/go-playground/pure/v5"
1414
)
1515

1616
const (

‎_examples/params/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package main
33
import (
44
"net/http"
55

6-
"github.com/go-playground/pure"
7-
mw "github.com/go-playground/pure/_examples/middleware/logging-recovery"
6+
"github.com/go-playground/pure/v5"
7+
mw "github.com/go-playground/pure/v5/_examples/middleware/logging-recovery"
88
)
99

1010
func main() {

‎go.mod‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
module github.com/go-playground/pure
1+
module github.com/go-playground/pure/v5
22

33
require (
4-
github.com/go-playground/pkg v0.0.0-20190522230805-792a755e6910
5-
gopkg.in/go-playground/assert.v1 v1.2.1
4+
github.com/go-playground/assert/v2 v2.0.1
5+
github.com/go-playground/pkg/v4 v4.0.0
66
)
7+
8+
go 1.13

‎go.sum‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
1-
github.com/go-playground/form v3.1.4+incompatible h1:lvKiHVxE2WvzDIoyMnWcjyiBxKt2+uFJyZcPYWsLnjI=
2-
github.com/go-playground/form v3.1.4+incompatible/go.mod h1:lhcKXfTuhRtIZCIKUeJ0b5F207aeQCPbZU09ScKjwWg=
3-
github.com/go-playground/pkg v0.0.0-20190511145249-fa4bcb050f1d h1:dLyXECWWFoQAp49e+ayPJyTcVAVOSAEmZ/QALeOuIfg=
4-
github.com/go-playground/pkg v0.0.0-20190511145249-fa4bcb050f1d/go.mod h1:Wg1j+HqWLhhVIfYdaoOuBzdutBEVcqwvBxgFZRWbybk=
5-
github.com/go-playground/pkg v0.0.0-20190513231740-fa00488a1202 h1:jcKZzz6ZD5IIQCG6TqMSvo/316htYd0fUz6zBXXUexE=
6-
github.com/go-playground/pkg v0.0.0-20190513231740-fa00488a1202/go.mod h1:Wg1j+HqWLhhVIfYdaoOuBzdutBEVcqwvBxgFZRWbybk=
7-
github.com/go-playground/pkg v0.0.0-20190513234448-af45a46936e9 h1:SMJgXE/ouCVX21NWAS6yfOmwPn8HvT1Ty4UAGWGr60w=
8-
github.com/go-playground/pkg v0.0.0-20190513234448-af45a46936e9/go.mod h1:Wg1j+HqWLhhVIfYdaoOuBzdutBEVcqwvBxgFZRWbybk=
9-
github.com/go-playground/pkg v0.0.0-20190513235050-6cd3d118a436 h1:5FwEqhdQHGB+01ryvrBy2Uig1cYQ/U4GVTT6fVSEOhA=
10-
github.com/go-playground/pkg v0.0.0-20190513235050-6cd3d118a436/go.mod h1:Wg1j+HqWLhhVIfYdaoOuBzdutBEVcqwvBxgFZRWbybk=
11-
github.com/go-playground/pkg v0.0.0-20190522230805-792a755e6910 h1:h7toKaxfg9ttAloheYEndInQhXwOC/Knglt0L5MMVCM=
12-
github.com/go-playground/pkg v0.0.0-20190522230805-792a755e6910/go.mod h1:Wg1j+HqWLhhVIfYdaoOuBzdutBEVcqwvBxgFZRWbybk=
13-
github.com/go-playground/pkg v1.0.1 h1:EsBCgjDTrlaLCflFChT2Q/M4unQQS6DnBDvHTA+fVAI=
14-
gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM=
15-
gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
1+
github.com/go-playground/assert v1.2.1 h1:ad06XqC+TOv0nJWnbULSlh3ehp5uLuQEojZY5Tq8RgI=
2+
github.com/go-playground/assert v1.2.1/go.mod h1:Lgy+k19nOB/wQG/fVSQ7rra5qYugmytMQqvQ2dgjWn8=
3+
github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
4+
github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
5+
github.com/go-playground/form/v4 v4.0.0 h1:vUKi2K1Hqlc4rpBc0tCclgs9zSfbY5yMKsL106db/eY=
6+
github.com/go-playground/form/v4 v4.0.0/go.mod h1:bodWfd97U9PVMZFcDsbVzSbQQTtaWrebnTwQtWjSW1M=
7+
github.com/go-playground/pkg/v4 v4.0.0 h1:0lTr9H8RyCwom4TcfNhMCNvlTlFuin7uUlXcZQuxrA4=
8+
github.com/go-playground/pkg/v4 v4.0.0/go.mod h1:TLowM3d3a/m04JlHK/zM6Ia8zf8+0C/9pTwhDEUqKO0=

‎group_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"net/http/httptest"
77
"testing"
88

9-
. "gopkg.in/go-playground/assert.v1"
9+
. "github.com/go-playground/assert/v2"
1010
)
1111

1212
// NOTES:

‎helpers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"net/url"
77
"strings"
88

9-
httpext "github.com/go-playground/pkg/net/http"
9+
httpext "github.com/go-playground/pkg/v4/net/http"
1010
)
1111

1212
// RequestVars returns the request scoped variables tracked by pure

0 commit comments

Comments
 (0)