From fdf3c3b8234ed340f40a85fb76d96ae3a9ccf195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Thu, 30 Aug 2018 11:10:25 +0200 Subject: [PATCH] build: Remove the remains of Go Dep Appveyor is now Go 1.11 ready, so we can go all "Go Modules". Closes #5115 --- Gopkg.lock | 715 ---------------------------------------------------- Gopkg.toml | 171 ------------- magefile.go | 35 --- 3 files changed, 921 deletions(-) delete mode 100644 Gopkg.lock delete mode 100644 Gopkg.toml diff --git a/Gopkg.lock b/Gopkg.lock deleted file mode 100644 index 08fb30283..000000000 --- a/Gopkg.lock +++ /dev/null @@ -1,715 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - branch = "master" - digest = "1:f6a10073544cc0bd1eb9fd9f8d9bf4644971910a0f8393d51b5b4d286e554849" - name = "github.com/BurntSushi/locker" - packages = ["."] - pruneopts = "" - revision = "a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a" - -[[projects]] - branch = "master" - digest = "1:fe421c7102aa7290dc831e2772971a2c74155013b68c2769c0da44383f7aa6be" - name = "github.com/BurntSushi/toml" - packages = ["."] - pruneopts = "" - revision = "a368813c5e648fee92e5f6c30e3944ff9d5e8895" - -[[projects]] - digest = "1:8e47871087b94913898333f37af26732faaab30cdb41571136cf7aec9921dae7" - name = "github.com/PuerkitoBio/purell" - packages = ["."] - pruneopts = "" - revision = "0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4" - version = "v1.1.0" - -[[projects]] - branch = "master" - digest = "1:331a419049c2be691e5ba1d24342fc77c7e767a80c666a18fd8a9f7b82419c1c" - name = "github.com/PuerkitoBio/urlesc" - packages = ["."] - pruneopts = "" - revision = "de5bf2ad457846296e2031421a34e2568e304e35" - -[[projects]] - branch = "master" - digest = "1:587118db822769eb67defc43c6d9363f4d6f615106fa6f510c668b78063e21bc" - name = "github.com/alecthomas/assert" - packages = ["."] - pruneopts = "" - revision = "405dbfeb8e38effee6e723317226e93fff912d06" - -[[projects]] - digest = "1:055c07e4af5ddccc93ad394e04e85ca76c3cb2e067b18b97ac3ffd49cb04a339" - name = "github.com/alecthomas/chroma" - packages = [ - ".", - "formatters", - "formatters/html", - "lexers", - "lexers/a", - "lexers/b", - "lexers/c", - "lexers/circular", - "lexers/d", - "lexers/e", - "lexers/f", - "lexers/g", - "lexers/h", - "lexers/i", - "lexers/internal", - "lexers/j", - "lexers/k", - "lexers/l", - "lexers/m", - "lexers/n", - "lexers/o", - "lexers/p", - "lexers/q", - "lexers/r", - "lexers/s", - "lexers/t", - "lexers/v", - "lexers/w", - "lexers/x", - "lexers/y", - "styles", - ] - pruneopts = "" - revision = "5d7fef2ae60b501bbf28d476c3f273b8017d8261" - version = "v0.5.0" - -[[projects]] - branch = "master" - digest = "1:ba0a389824c3c3d378f5f334370524b7d04b5a5ccedce7dd2da05ae8d3868609" - name = "github.com/alecthomas/colour" - packages = ["."] - pruneopts = "" - revision = "60882d9e27213e8552dcff6328914fe4c2b44bc9" - -[[projects]] - branch = "master" - digest = "1:1b12d492967d13ec7360082e12a1eb6e1be195baa5c83f23b371a490a40decda" - name = "github.com/alecthomas/repr" - packages = ["."] - pruneopts = "" - revision = "ead21651dde39fea129e6e4a612c675693d0f4ff" - -[[projects]] - digest = "1:05d0e4ae6b8d0273647964fe26762e3345d5d196aaeb858838e75336703451ba" - name = "github.com/bep/debounce" - packages = ["."] - pruneopts = "" - revision = "844797fa1dd9ba969d71b62797ff19d1e49d4eac" - version = "v1.1.0" - -[[projects]] - digest = "1:da56e55c4bf803e26ff8ece34f7b54727fdf053fbb2b50f92043e41ab2ef1e78" - name = "github.com/bep/gitmap" - packages = ["."] - pruneopts = "" - revision = "ecb6fe06dbfd6bb4225e7fda7dc15612ecc8d960" - version = "v1.0.0" - -[[projects]] - digest = "1:50f18fd801868be859fa7fdddfc3a56ec41b562176f84db31b2b78cedb530326" - name = "github.com/bep/go-tocss" - packages = [ - "scss", - "scss/libsass", - "tocss", - ] - pruneopts = "" - revision = "2abb118dc8688b6c7df44e12f4152c2bded9b19c" - version = "v0.5.0" - -[[projects]] - digest = "1:d814bbb551582d8f27085f6a9d941024ef20c3bee0132da6f9841c062cf338de" - name = "github.com/chaseadamsio/goorgeous" - packages = ["."] - pruneopts = "" - revision = "dcf1ef873b8987bf12596fe6951c48347986eb2f" - version = "v1.1.0" - -[[projects]] - digest = "1:5b5e11b56adf922e0efc8856f86420a3467607975ff8ecb54bb0bac318c1548f" - name = "github.com/cpuguy83/go-md2man" - packages = ["md2man"] - pruneopts = "" - revision = "a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa" - version = "v1.0.6" - -[[projects]] - branch = "master" - digest = "1:8f6c36ee73ded871996ada894e20dfecde56557d08b4d1849d5489076679971f" - name = "github.com/danwakefield/fnmatch" - packages = ["."] - pruneopts = "" - revision = "cbb64ac3d964b81592e64f957ad53df015803288" - -[[projects]] - digest = "1:56c130d885a4aacae1dd9c7b71cfe39912c7ebc1ff7d2b46083c8812996dc43b" - name = "github.com/davecgh/go-spew" - packages = ["spew"] - pruneopts = "" - revision = "346938d642f2ec3594ed81d874461961cd0faa76" - version = "v1.1.0" - -[[projects]] - digest = "1:b218908776d4939d4ecfd8ae87918d17b01b491e219d09bedf24b4aeb0f0b7e9" - name = "github.com/disintegration/imaging" - packages = ["."] - pruneopts = "" - revision = "dd50a3ee9985ccd313a2f03c398fcaedc96dc707" - version = "v1.2.4" - -[[projects]] - digest = "1:556b75e96f02319585d253d262c4ce5dfdf4b28be474f1e0877c5f4f9b10cf9e" - name = "github.com/dlclark/regexp2" - packages = [ - ".", - "syntax", - ] - pruneopts = "" - revision = "487489b64fb796de2e55f4e8a4ad1e145f80e957" - version = "v1.1.6" - -[[projects]] - branch = "master" - digest = "1:f0cd82a11574a06f08e22bf3c2ba0c259f4c84f73d95d011d7024b78febe17e9" - name = "github.com/eknkc/amber" - packages = [ - ".", - "parser", - ] - pruneopts = "" - revision = "cdade1c073850f4ffc70a829e31235ea6892853b" - -[[projects]] - digest = "1:e5c807ac3b60699ccec9263f6eec756251b17e78582eb149f90ac345d9e58327" - name = "github.com/fortytw2/leaktest" - packages = ["."] - pruneopts = "" - revision = "a5ef70473c97b71626b9abeda80ee92ba2a7de9e" - version = "v1.2.0" - -[[projects]] - digest = "1:eb53021a8aa3f599d29c7102e65026242bdedce998a54837dc67f14b6a97c5fd" - name = "github.com/fsnotify/fsnotify" - packages = ["."] - pruneopts = "" - revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9" - version = "v1.4.7" - -[[projects]] - digest = "1:9ab1b1c637d7c8f49e39d8538a650d7eb2137b076790cff69d160823b505964c" - name = "github.com/gobwas/glob" - packages = [ - ".", - "compiler", - "match", - "syntax", - "syntax/ast", - "syntax/lexer", - "util/runes", - "util/strings", - ] - pruneopts = "" - revision = "5ccd90ef52e1e632236f7326478d4faa74f99438" - version = "v0.2.3" - -[[projects]] - digest = "1:64d212c703a2b94054be0ce470303286b177ad260b2f89a307e3d1bb6c073ef6" - name = "github.com/gorilla/websocket" - packages = ["."] - pruneopts = "" - revision = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b" - version = "v1.2.0" - -[[projects]] - branch = "master" - digest = "1:4423ee95d6ee30bb22f680445c58889bb5b91e1b955405bf34374a053784a8a2" - name = "github.com/hashicorp/go-immutable-radix" - packages = ["."] - pruneopts = "" - revision = "7f3cd4390caab3250a57f30efdb2a65dd7649ecf" - -[[projects]] - branch = "master" - digest = "1:9c776d7d9c54b7ed89f119e449983c3f24c0023e75001d6092442412ebca6b94" - name = "github.com/hashicorp/golang-lru" - packages = ["simplelru"] - pruneopts = "" - revision = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3" - -[[projects]] - branch = "master" - digest = "1:9b7c5846d70f425d7fe279595e32a20994c6075e87be03b5c367ed07280877c5" - name = "github.com/hashicorp/hcl" - packages = [ - ".", - "hcl/ast", - "hcl/parser", - "hcl/printer", - "hcl/scanner", - "hcl/strconv", - "hcl/token", - "json/parser", - "json/scanner", - "json/token", - ] - pruneopts = "" - revision = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168" - -[[projects]] - digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be" - name = "github.com/inconshreveable/mousetrap" - packages = ["."] - pruneopts = "" - revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" - version = "v1.0" - -[[projects]] - digest = "1:dddb389214f3ebf7c1f885d0e1f9498a17608f4a9b623c827cafb3c5f91f9ac4" - name = "github.com/jdkato/prose" - packages = [ - "internal/util", - "transform", - ] - pruneopts = "" - revision = "20d3663d4bc9dd10d75abcde9d92e04b4861c674" - version = "v1.1.0" - -[[projects]] - digest = "1:41ea0e53c25c1c7f51b3ff6589bcf586a0fb548caceeb6a5dd60b91ed19ea801" - name = "github.com/kyokomi/emoji" - packages = ["."] - pruneopts = "" - revision = "2e9a9507333f3ee28f3fab88c2c3aba34455d734" - version = "v1.5.1" - -[[projects]] - digest = "1:901c7dc16a166e57e940dee1350511ba5cb5e61eeca858edb76d21b65f9b7cff" - name = "github.com/magefile/mage" - packages = [ - "mg", - "sh", - ] - pruneopts = "" - revision = "2f974307b636f59c13b88704cf350a4772fef271" - version = "v1.0.2" - -[[projects]] - digest = "1:961dc3b1d11f969370533390fdf203813162980c858e1dabe827b60940c909a5" - name = "github.com/magiconair/properties" - packages = ["."] - pruneopts = "" - revision = "c2353362d570a7bfa228149c62842019201cfb71" - version = "v1.8.0" - -[[projects]] - digest = "1:fd46423a2fe75d52968baf37471b99e6f05cea3ac29c756128ead26af34e1c35" - name = "github.com/markbates/inflect" - packages = ["."] - pruneopts = "" - revision = "a12c3aec81a6a938bf584a4bac567afed9256586" - -[[projects]] - digest = "1:78229b46ddb7434f881390029bd1af7661294af31f6802e0e1bedaad4ab0af3c" - name = "github.com/mattn/go-isatty" - packages = ["."] - pruneopts = "" - revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39" - version = "v0.0.3" - -[[projects]] - digest = "1:81e673df85e765593a863f67cba4544cf40e8919590f04d67664940786c2b61a" - name = "github.com/mattn/go-runewidth" - packages = ["."] - pruneopts = "" - revision = "9e777a8366cce605130a531d2cd6363d07ad7317" - version = "v0.0.2" - -[[projects]] - digest = "1:bb98cbb82602cde3cafa5e2ee9b8fb1de3d57d490c09f0988d7edf2b30afec2d" - name = "github.com/miekg/mmark" - packages = ["."] - pruneopts = "" - revision = "fd2f6c1403b37925bd7fe13af05853b8ae58ee5f" - version = "v1.3.6" - -[[projects]] - branch = "master" - digest = "1:0de0f377aeccd41384e883c59c6f184c9db01c96db33a2724a1eaadd60f92629" - name = "github.com/mitchellh/hashstructure" - packages = ["."] - pruneopts = "" - revision = "2bca23e0e452137f789efbc8610126fd8b94f73b" - -[[projects]] - branch = "master" - digest = "1:f43ed2c836208c14f45158fd01577c985688a4d11cf9fd475a939819fef3b321" - name = "github.com/mitchellh/mapstructure" - packages = ["."] - pruneopts = "" - revision = "f15292f7a699fcc1a38a80977f80a046874ba8ac" - -[[projects]] - branch = "master" - digest = "1:a21a59f6adec3256fd6f5bd0377cb95ff8128d3ab716fae9944e71b017c68b49" - name = "github.com/muesli/smartcrop" - packages = [ - ".", - "options", - ] - pruneopts = "" - revision = "f6ebaa786a12a0fdb2d7c6dee72808e68c296464" - -[[projects]] - digest = "1:9fa4a4a684dfb36f3ba1b0a163225140e19e3219e5576d0761d02dbd4c31b743" - name = "github.com/nicksnyder/go-i18n" - packages = [ - "i18n/bundle", - "i18n/language", - "i18n/translation", - ] - pruneopts = "" - revision = "0dc1626d56435e9d605a29875701721c54bc9bbd" - version = "v1.10.0" - -[[projects]] - branch = "master" - digest = "1:816e800c7b5689e114c0dc6acf494553d1e7a52575764c5d6de67fb32bd8bbb2" - name = "github.com/olekukonko/tablewriter" - packages = ["."] - pruneopts = "" - revision = "d4647c9c7a84d847478d890b816b7d8b62b0b279" - -[[projects]] - digest = "1:894aef961c056b6d85d12bac890bf60c44e99b46292888bfa66caf529f804457" - name = "github.com/pelletier/go-toml" - packages = ["."] - pruneopts = "" - revision = "c01d1270ff3e442a8a57cddc1c92dc1138598194" - version = "v1.2.0" - -[[projects]] - digest = "1:256484dbbcd271f9ecebc6795b2df8cad4c458dd0f5fd82a8c2fa0c29f233411" - name = "github.com/pmezard/go-difflib" - packages = ["difflib"] - pruneopts = "" - revision = "792786c7400a136282c1664665ae0a8db921c6c2" - version = "v1.0.0" - -[[projects]] - branch = "master" - digest = "1:3f5b207bd1428aeb3d4bdb65f787236883a5d2d2dd154af011a078b0732d4de9" - name = "github.com/russross/blackfriday" - packages = ["."] - pruneopts = "" - revision = "46c73eb196baff5bb07288f245b223bd1a30fba6" - -[[projects]] - digest = "1:354988e51f0b9061a2d6b94e84ede12be35bc09ee3be23f61c9d18246b0c2c24" - name = "github.com/sanity-io/litter" - packages = ["."] - pruneopts = "" - revision = "ae543b7ba8fd6af63e4976198f146e1348ae53c1" - version = "v1.1.0" - -[[projects]] - digest = "1:3962f553b77bf6c03fc07cd687a22dd3b00fe11aa14d31194f5505f5bb65cdc8" - name = "github.com/sergi/go-diff" - packages = ["diffmatchpatch"] - pruneopts = "" - revision = "1744e2970ca51c86172c8190fadad617561ed6e7" - version = "v1.0.0" - -[[projects]] - branch = "master" - digest = "1:606fa779c7a80ab6a9ec5836cd12759f86cd6e1d82d5d60cf7ec5133e78c6cf8" - name = "github.com/shurcooL/sanitized_anchor_name" - packages = ["."] - pruneopts = "" - revision = "86672fcb3f950f35f2e675df2240550f2a50762f" - -[[projects]] - digest = "1:7ba2551c9a8de293bc575dbe2c0d862c52252d26f267f784547f059f512471c8" - name = "github.com/spf13/afero" - packages = [ - ".", - "mem", - ] - pruneopts = "" - revision = "787d034dfe70e44075ccc060d346146ef53270ad" - version = "v1.1.1" - -[[projects]] - digest = "1:d0b38ba6da419a6d4380700218eeec8623841d44a856bb57369c172fbf692ab4" - name = "github.com/spf13/cast" - packages = ["."] - pruneopts = "" - revision = "8965335b8c7107321228e3e3702cab9832751bac" - version = "v1.2.0" - -[[projects]] - digest = "1:a1403cc8a94b8d7956ee5e9694badef0e7b051af289caad1cf668331e3ffa4f6" - name = "github.com/spf13/cobra" - packages = [ - ".", - "doc", - ] - pruneopts = "" - revision = "ef82de70bb3f60c65fb8eebacbb2d122ef517385" - version = "v0.0.3" - -[[projects]] - branch = "master" - digest = "1:7c00f445c89f468abd5ab86546ba1fa11bac66e63325ade8ca05aa7220791fc7" - name = "github.com/spf13/fsync" - packages = ["."] - pruneopts = "" - revision = "12a01e648f05a938100a26858d2d59a120307a18" - -[[projects]] - branch = "master" - digest = "1:104517520aab91164020ab6524a5d6b7cafc641b2e42ac6236f6ac1deac4f66a" - name = "github.com/spf13/jwalterweatherman" - packages = ["."] - pruneopts = "" - revision = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394" - -[[projects]] - branch = "master" - digest = "1:5082c0d57a199dabc0868010784039249af0932fad2990b51ad9404c9a6b6e5d" - name = "github.com/spf13/nitro" - packages = ["."] - pruneopts = "" - revision = "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8" - -[[projects]] - digest = "1:8e243c568f36b09031ec18dff5f7d2769dcf5ca4d624ea511c8e3197dc3d352d" - name = "github.com/spf13/pflag" - packages = ["."] - pruneopts = "" - revision = "583c0c0531f06d5278b7d917446061adc344b5cd" - version = "v1.0.1" - -[[projects]] - digest = "1:a3018c5a423d6cfacf5c6e736ad07637494728fb446390e3f34cacae9e80a529" - name = "github.com/spf13/viper" - packages = ["."] - pruneopts = "" - revision = "907c19d40d9a6c9bb55f040ff4ae45271a4754b9" - version = "v1.1.0" - -[[projects]] - digest = "1:c587772fb8ad29ad4db67575dad25ba17a51f072ff18a22b4f0257a4d9c24f75" - name = "github.com/stretchr/testify" - packages = [ - "assert", - "require", - ] - pruneopts = "" - revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686" - version = "v1.2.2" - -[[projects]] - digest = "1:0308279931f894a1ba11e7d354d346c96ead9c7539a4fff1fce030845ec6c780" - name = "github.com/tdewolff/minify" - packages = [ - ".", - "css", - "html", - "js", - "json", - "svg", - "xml", - ] - pruneopts = "" - revision = "8d72a4127ae33b755e95bffede9b92e396267ce2" - version = "v2.3.5" - -[[projects]] - digest = "1:6e64aa755995f3185ee55306ada462999775b8faae39aec142b3fd54248dd5ee" - name = "github.com/tdewolff/parse" - packages = [ - ".", - "buffer", - "css", - "html", - "js", - "json", - "strconv", - "svg", - "xml", - ] - pruneopts = "" - revision = "d739d6fccb0971177e06352fea02d3552625efb1" - version = "v2.3.3" - -[[projects]] - branch = "master" - digest = "1:be92e3574c94090ee4659d49a4ab156301fd62c2bdad831ca52ad7ce3ee91e2e" - name = "github.com/wellington/go-libsass" - packages = ["libs"] - pruneopts = "" - revision = "615eaa47ef794d037c1906a0eb7bf85375a5decf" - -[[projects]] - digest = "1:bf83d7fb8e87f39806ce3550657a8a31bbeb96a35eb105bd98e7362559fba27f" - name = "github.com/yosssi/ace" - packages = ["."] - pruneopts = "" - revision = "ea038f4770b6746c3f8f84f14fa60d9fe1205b56" - version = "v0.0.5" - -[[projects]] - branch = "master" - digest = "1:0960a9f676f505c50b45b2db87151ef60991c6f4764083b02acfabf09bcdc5cc" - name = "golang.org/x/image" - packages = [ - "bmp", - "draw", - "math/f64", - "riff", - "tiff", - "tiff/lzw", - "vp8", - "vp8l", - "webp", - ] - pruneopts = "" - revision = "c73c2afc3b812cdd6385de5a50616511c4a3d458" - -[[projects]] - branch = "master" - digest = "1:b970d5e8b11b4c8927a06298566eb8daf66a009702688b4142cc2a961e374e91" - name = "golang.org/x/net" - packages = [ - "context", - "idna", - ] - pruneopts = "" - revision = "f4c29de78a2a91c00474a2e689954305c350adf9" - -[[projects]] - branch = "master" - digest = "1:b2ea75de0ccb2db2ac79356407f8a4cd8f798fe15d41b381c00abf3ae8e55ed1" - name = "golang.org/x/sync" - packages = ["errgroup"] - pruneopts = "" - revision = "1d60e4601c6fd243af51cc01ddf169918a5407ca" - -[[projects]] - branch = "master" - digest = "1:41e7b97b66e984325fed9d6cd43ca9e2efdd3c711980916ad444667d633f13f1" - name = "golang.org/x/sys" - packages = ["unix"] - pruneopts = "" - revision = "2be389f392cd91df245b41638f818a1c041f0c08" - -[[projects]] - branch = "master" - digest = "1:243aef9eafbe63eb8ca74de9497597832721201e92a9203078173d90a494456c" - name = "golang.org/x/text" - packages = [ - "collate", - "collate/build", - "internal/colltab", - "internal/gen", - "internal/language", - "internal/language/compact", - "internal/tag", - "internal/triegen", - "internal/ucd", - "language", - "secure/bidirule", - "transform", - "unicode/bidi", - "unicode/cldr", - "unicode/norm", - "unicode/rangetable", - "width", - ] - pruneopts = "" - revision = "cb6730876b985e110843c1842a7a63a63677cf08" - -[[projects]] - branch = "v2" - digest = "1:f0620375dd1f6251d9973b5f2596228cc8042e887cd7f827e4220bc1ce8c30e2" - name = "gopkg.in/yaml.v2" - packages = ["."] - pruneopts = "" - revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - input-imports = [ - "github.com/BurntSushi/locker", - "github.com/BurntSushi/toml", - "github.com/PuerkitoBio/purell", - "github.com/alecthomas/assert", - "github.com/alecthomas/chroma", - "github.com/alecthomas/chroma/formatters", - "github.com/alecthomas/chroma/formatters/html", - "github.com/alecthomas/chroma/lexers", - "github.com/alecthomas/chroma/styles", - "github.com/bep/debounce", - "github.com/bep/gitmap", - "github.com/bep/go-tocss/scss", - "github.com/bep/go-tocss/scss/libsass", - "github.com/bep/go-tocss/tocss", - "github.com/chaseadamsio/goorgeous", - "github.com/disintegration/imaging", - "github.com/eknkc/amber", - "github.com/fortytw2/leaktest", - "github.com/fsnotify/fsnotify", - "github.com/gobwas/glob", - "github.com/gorilla/websocket", - "github.com/hashicorp/go-immutable-radix", - "github.com/jdkato/prose/transform", - "github.com/kyokomi/emoji", - "github.com/magefile/mage/mg", - "github.com/magefile/mage/sh", - "github.com/markbates/inflect", - "github.com/miekg/mmark", - "github.com/mitchellh/hashstructure", - "github.com/mitchellh/mapstructure", - "github.com/muesli/smartcrop", - "github.com/nicksnyder/go-i18n/i18n/bundle", - "github.com/nicksnyder/go-i18n/i18n/language", - "github.com/olekukonko/tablewriter", - "github.com/russross/blackfriday", - "github.com/sanity-io/litter", - "github.com/spf13/afero", - "github.com/spf13/cast", - "github.com/spf13/cobra", - "github.com/spf13/cobra/doc", - "github.com/spf13/fsync", - "github.com/spf13/jwalterweatherman", - "github.com/spf13/nitro", - "github.com/spf13/pflag", - "github.com/spf13/viper", - "github.com/stretchr/testify/assert", - "github.com/stretchr/testify/require", - "github.com/tdewolff/minify", - "github.com/tdewolff/minify/css", - "github.com/tdewolff/minify/html", - "github.com/tdewolff/minify/js", - "github.com/tdewolff/minify/json", - "github.com/tdewolff/minify/svg", - "github.com/tdewolff/minify/xml", - "github.com/yosssi/ace", - "golang.org/x/image/webp", - "golang.org/x/net/context", - "golang.org/x/sync/errgroup", - "golang.org/x/text/transform", - "golang.org/x/text/unicode/norm", - "gopkg.in/yaml.v2", - ] - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml deleted file mode 100644 index dd697722b..000000000 --- a/Gopkg.toml +++ /dev/null @@ -1,171 +0,0 @@ - - -[[constraint]] - name = "github.com/BurntSushi/toml" - branch = "master" - -[[constraint]] - name = "github.com/PuerkitoBio/purell" - version = "1.1.0" - -[[constraint]] - name = "github.com/alecthomas/chroma" - version = "^0.5.0" - -[[constraint]] - name = "github.com/bep/gitmap" - version = "^1.0.0" - -[[constraint]] - version = "v0.5.0" - name = "github.com/bep/go-tocss" - -[[override]] - branch = "master" - name = "github.com/wellington/go-libsass" - -[[constraint]] - name = "github.com/chaseadamsio/goorgeous" - version = "^1.1.0" - -[[constraint]] - name = "github.com/disintegration/imaging" - version = "~v1.2.4" - -[[constraint]] - name = "github.com/magefile/mage" - version = "^v2.2.0" - -[[constraint]] - branch = "master" - name = "github.com/eknkc/amber" - -[[constraint]] - name = "github.com/fortytw2/leaktest" - version = "1.1.0" - -[[constraint]] - name = "github.com/fsnotify/fsnotify" - version = "^1.4.0" - -[[constraint]] - name = "github.com/gorilla/websocket" - version = "1.2.0" - -[[constraint]] - branch = "master" - name = "github.com/hashicorp/go-immutable-radix" - -[[constraint]] - name = "github.com/jdkato/prose" - version = "1.1.0" - -[[constraint]] - name = "github.com/kyokomi/emoji" - version = "1.5.0" - -[[constraint]] - name = "github.com/markbates/inflect" - revision = "a12c3aec81a6a938bf584a4bac567afed9256586" - -[[constraint]] - name = "github.com/miekg/mmark" - version = "^1.3.6" - -[[constraint]] - branch = "master" - name = "github.com/mitchellh/mapstructure" - -[[constraint]] - name = "github.com/nicksnyder/go-i18n" - version = "^1.10.0" - -[[constraint]] - name = "github.com/russross/blackfriday" - branch = "master" - -[[constraint]] - name = "github.com/spf13/afero" - version = "^1.1.0" - -[[constraint]] - name = "github.com/spf13/cast" - version = "^1.1.0" - -[[constraint]] - version = "^0.0.1" - name = "github.com/spf13/cobra" - -[[constraint]] - branch = "master" - name = "github.com/spf13/fsync" - -[[constraint]] - branch = "master" - name = "github.com/spf13/jwalterweatherman" - -[[constraint]] - branch = "master" - name = "github.com/spf13/nitro" - -[[constraint]] - name = "github.com/spf13/pflag" - version = "1.0.0" - -[[constraint]] - name = "github.com/spf13/viper" - version = "1.0.0" - -[[constraint]] - name = "github.com/stretchr/testify" - version = "1.1.4" - -[[constraint]] - branch = "master" - name = "github.com/olekukonko/tablewriter" - -[[constraint]] - name = "github.com/yosssi/ace" - version = "^0.0.5" - -[[constraint]] - branch = "master" - name = "golang.org/x/image" - -[[constraint]] - branch = "master" - name = "golang.org/x/text" - -[[constraint]] - branch = "v2" - name = "gopkg.in/yaml.v2" - -[[constraint]] - name = "github.com/gobwas/glob" - version = "0.2.2" - - -[[constraint]] - name = "github.com/muesli/smartcrop" - branch = "master" - - -[[constraint]] - name = "github.com/sanity-io/litter" - version = "1.1.0" - -[[constraint]] - name = "github.com/bep/debounce" - version = "^1.1.0" - -[[constraint]] - name = "github.com/tdewolff/minify" - version = "^2.3.5" - -[[constraint]] - branch = "master" - name = "github.com/BurntSushi/locker" - -[[constraint]] - branch = "master" - name = "github.com/mitchellh/hashstructure" diff --git a/magefile.go b/magefile.go index ecc4b0b58..91c79b1dd 100644 --- a/magefile.go +++ b/magefile.go @@ -38,24 +38,6 @@ func init() { os.Setenv("GO111MODULE", "on") } -func getDep() error { - if !isWindows() { - // We only need this on Appveyor. - // TODO(bep) go11 clean up the vendor stuff once Appveyor gets Go 1.11. - return nil - } - return sh.Run(goexe, "get", "-u", "github.com/golang/dep/cmd/dep") -} - -// Install Go Dep and sync Hugo's vendored dependencies -func Vendor() error { - if !isWindows() { - return nil - } - mg.Deps(getDep) - return sh.Run("dep", "ensure") -} - // Build hugo binary func Hugo() error { return sh.RunWith(flagEnv(), goexe, "build", "-ldflags", ldflags, "-tags", buildTags(), packageName) @@ -182,7 +164,6 @@ func Fmt() error { var pkgPrefixLen = len("github.com/gohugoio/hugo") func hugoPackages() ([]string, error) { - mg.Deps(getDep) s, err := sh.Output(goexe, "list", "./...") if err != nil { return nil, err @@ -217,7 +198,6 @@ func Lint() error { // Run go vet linter func Vet() error { - mg.Deps(getDep) if err := sh.Run(goexe, "vet", "./..."); err != nil { return fmt.Errorf("error running govendor: %v", err) } @@ -226,7 +206,6 @@ func Vet() error { // Generate test coverage report func TestCoverHTML() error { - mg.Deps(getDep) const ( coverAll = "coverage-all.out" cover = "coverage.out" @@ -266,24 +245,10 @@ func TestCoverHTML() error { return sh.Run(goexe, "tool", "cover", "-html="+coverAll) } -// Verify that vendored packages match git HEAD -func CheckVendor() error { - if err := sh.Run("git", "diff-index", "--quiet", "HEAD", "vendor/"); err != nil { - // yes, ignore errors from this, not much we can do. - sh.Exec(nil, os.Stdout, os.Stderr, "git", "diff", "vendor/") - return errors.New("check-vendor target failed: vendored packages out of sync") - } - return nil -} - func isGoLatest() bool { return strings.Contains(runtime.Version(), "1.11") } -func isWindows() bool { - return runtime.GOOS == "windows" -} - func buildTags() string { // To build the extended Hugo SCSS/SASS enabled version, build with // HUGO_BUILD_TAGS=extended mage install etc.