Merge pull request #31 from multiformats/chore/fix-tests

Stebalien · web-flow · commit be9e91119aa2 · 2020-05-21T12:14:29.000-07:00
Remove GX, bump spec submodule, fix tests
diff --git a/.gx/lastpubver b/.gx/lastpubver
diff --git a/.gxignore b/.gxignore
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,6 @@ env:
   global:
     - GOTFLAGS="-race"
   matrix:
-    - BUILD_DEPTYPE=gx
     - BUILD_DEPTYPE=gomod
 
 
@@ -24,7 +23,6 @@ script:
 
 cache:
   directories:
-    - $GOPATH/src/gx
     - $GOPATH/pkg/mod
     - /home/travis/.cache/go-build
 
diff --git a/Makefile b/Makefile
@@ -3,11 +3,5 @@ test: deps
 
 export IPFS_API ?= v04x.ipfs.io
 
-gx:
-	go get -u github.com/whyrusleeping/gx
-	go get -u github.com/whyrusleeping/gx-go
-
-deps: gx
-	gx --verbose install --global
-	gx-go rewrite
+deps:
 	go get -t ./...
diff --git a/README.md b/README.md
@@ -18,24 +18,6 @@
 go get github.com/multiformats/go-multibase
 ```
 
-Note that `go-multibase` is packaged with Gx, so it is recommended to use Gx to install and use it (see Usage section).
-
-## Usage
-
-This module is packaged with [Gx](https://github.com/whyrusleeping/gx). In order to use it in your own project it is recommended that you:
-
-```sh
-go get -u github.com/whyrusleeping/gx
-go get -u github.com/whyrusleeping/gx-go
-cd <your-project-repository>
-gx init
-gx import github.com/multiformats/go-multibase
-gx install --global
-gx-go --rewrite
-```
-
-Please check [Gx](https://github.com/whyrusleeping/gx) and [Gx-go](https://github.com/whyrusleeping/gx-go) documentation for more information.
-
 ## Contribute
 
 Contributions welcome. Please check out [the issues](https://github.com/multiformats/go-multibase/issues).
diff --git a/go.mod b/go.mod
@@ -1,5 +1,7 @@
 module github.com/multiformats/go-multibase
 
+go 1.11
+
 require (
 	github.com/mr-tron/base58 v1.1.0
 	github.com/multiformats/go-base32 v0.0.3
diff --git a/package.json b/package.json
@@ -3,28 +3,8 @@
   "bugs": {
     "url": "https://github.com/multiformats/go-multibase"
   },
-  "gx": {
-    "dvcsimport": "github.com/multiformats/go-multibase"
-  },
-  "gxDependencies": [
-    {
-      "author": "mr-tron",
-      "hash": "QmWFAMPqsEyUX7gDUsRVmMWz59FxSpJ1b2v6bJ1yYzo7jY",
-      "name": "go-base58-fast",
-      "version": "0.1.1"
-    },
-    {
-      "author": "Golang",
-      "hash": "QmPbbYin7KBd1Y1BfUe15vHzwJiioyi3wtKQTtXWWf8SC5",
-      "name": "base32",
-      "version": "0.0.3"
-    }
-  ],
-  "gxVersion": "0.8.0",
   "language": "go",
   "license": "",
   "name": "go-multibase",
-  "releaseCmd": "git commit -a -m \"gx publish $VERSION\"",
   "version": "0.3.0"
 }
-
diff --git a/spec b/spec
@@ -1 +1 @@
-Subproject commit 65d3fff8341f525c68d8b3e56fa668e2c8c4956b
+Subproject commit 54f897a5032fc35d2ae50477c2918da715b43efb
diff --git a/spec_test.go b/spec_test.go
@@ -19,7 +19,7 @@ func TestSpec(t *testing.T) {
 
 	reader := csv.NewReader(file)
 	reader.LazyQuotes = false
-	reader.FieldsPerRecord = 3
+	reader.FieldsPerRecord = 4
 	reader.TrimLeadingSpace = true
 
 	values, err := reader.ReadAll()

-Original file line number
+Diff line change
@@ @@ -1,5 +1,7 @@ @@
 module github.com/multiformats/go-multibase
 +go 1.11
++
 require (
 	github.com/mr-tron/base58 v1.1.0
 	github.com/multiformats/go-base32 v0.0.3