diff options
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 6 | ||||
| -rw-r--r-- | config.ld | 2 | ||||
| -rw-r--r-- | lua/pl/utils.lua | 2 | ||||
| -rw-r--r-- | penlight-dev-1.rockspec | 20 | ||||
| -rw-r--r-- | rockspecs/penlight-1.10.0-1.rockspec | 78 |
6 files changed, 98 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a1d4b27..f049d45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ deprecation policy. see [CONTRIBUTING.md](CONTRIBUTING.md#release-instructions-for-a-new-version) for release instructions -## 1.10.0 unreleased +## 1.10.0 (2021-04-27) - deprecate: `permute.iter`, renamed to `permute.order_iter` (removal later) [#360](https://github.com/lunarmodules/Penlight/pull/360) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7b99b65..74cde11 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -48,12 +48,12 @@ before making more changes - that way we can take in each change separately. - update `./config.ld` with the new version number - create a new rockspec file for the version in `./rockspecs` - check the `./CHANGELOG.md` files for completeness - - commit the release related changes + - commit the release related changes with `release x.y.z` - render the documentation using `ldoc .` - - commit the documentation as a separate commit + - commit the documentation as a separate commit with `release x.y.z docs` - push the release branch and create a PR - merge the PR - - tag the release and push the tag to the github repo + - tag the release as `x.y.z` and push the tag to the github repo - upload the rockspec, and source rock files to LuaRocks - test installing through LuaRocks - announce the release on the Lua mailing list @@ -1,5 +1,5 @@ project = 'Penlight' -description = 'Penlight Lua Libraries 1.9.2' +description = 'Penlight Lua Libraries 1.10.0' full_description = 'Penlight is a set of pure Lua libraries for making it easier to work with common tasks like iterating over directories, reading configuration files and the like. Provides functional operations on tables and sequences. Visit the <a href="https://github.com/lunarmodules/Penlight">GitHub project</a> to review the code or file issues. Skip to the @{01-introduction.md|introduction}.' title = 'Penlight Documentation' dir = 'docs' diff --git a/lua/pl/utils.lua b/lua/pl/utils.lua index a8bf360..cdb7b82 100644 --- a/lua/pl/utils.lua +++ b/lua/pl/utils.lua @@ -18,7 +18,7 @@ local operators local _function_factories = {} -local utils = { _VERSION = "1.9.2" } +local utils = { _VERSION = "1.10.0" } for k, v in pairs(compat) do utils[k] = v end --- Some standard patterns diff --git a/penlight-dev-1.rockspec b/penlight-dev-1.rockspec index b02570f..343bfcb 100644 --- a/penlight-dev-1.rockspec +++ b/penlight-dev-1.rockspec @@ -1,10 +1,18 @@ +local package_name = "penlight" +local package_version = "dev" +local rockspec_revision = "1" +local github_account_name = "lunarmodules" +local github_repo_name = package_name +local git_checkout = package_version == "dev" and "master" or package_version + + rockspec_format = "3.0" -package = "penlight" -version = "dev-1" +package = package_name +version = package_version .. "-" .. rockspec_revision source = { - url = "git://github.com/lunarmodules/Penlight.git", - branch = "master" + url = "git://github.com/"..github_account_name.."/"..github_repo_name..".git", + branch = git_checkout } description = { @@ -16,8 +24,8 @@ description = { Much of the functionality is inspired by the Python standard libraries. ]], license = "MIT/X11", - homepage = "https://lunarmodules.github.io/Penlight", - issues_url = "https://github.com/lunarmodules/Penlight/issues", + homepage = "https://"..github_account_name..".github.io/"..github_repo_name, + issues_url = "https://github.com/"..github_account_name.."/"..github_repo_name.."/issues", maintainer = "thijs@thijsschreijer.nl", } diff --git a/rockspecs/penlight-1.10.0-1.rockspec b/rockspecs/penlight-1.10.0-1.rockspec new file mode 100644 index 0000000..6bcc6ab --- /dev/null +++ b/rockspecs/penlight-1.10.0-1.rockspec @@ -0,0 +1,78 @@ +local package_name = "penlight" +local package_version = "1.10.0" +local rockspec_revision = "1" +local github_account_name = "lunarmodules" +local github_repo_name = package_name +local git_checkout = package_version == "dev" and "master" or package_version + + +package = package_name +version = package_version .. "-" .. rockspec_revision + +source = { + url = "git://github.com/"..github_account_name.."/"..github_repo_name..".git", + branch = git_checkout +} + +description = { + summary = "Lua utility libraries loosely based on the Python standard libraries", + homepage = "https://"..github_account_name..".github.io/"..github_repo_name, + license = "MIT/X11", + maintainer = "thijs@thijsschreijer.nl", + detailed = [[ +Penlight is a set of pure Lua libraries for making it easier to work with common tasks like +iterating over directories, reading configuration files and the like. Provides functional operations +on tables and sequences. +]] +} + +dependencies = { + "luafilesystem", +} + +build = { + type = "builtin", + modules = { + ["pl.strict"] = "lua/pl/strict.lua", + ["pl.dir"] = "lua/pl/dir.lua", + ["pl.operator"] = "lua/pl/operator.lua", + ["pl.input"] = "lua/pl/input.lua", + ["pl.config"] = "lua/pl/config.lua", + ["pl.compat"] = "lua/pl/config.lua", + ["pl.seq"] = "lua/pl/seq.lua", + ["pl.stringio"] = "lua/pl/stringio.lua", + ["pl.text"] = "lua/pl/text.lua", + ["pl.test"] = "lua/pl/test.lua", + ["pl.tablex"] = "lua/pl/tablex.lua", + ["pl.app"] = "lua/pl/app.lua", + ["pl.stringx"] = "lua/pl/stringx.lua", + ["pl.lexer"] = "lua/pl/lexer.lua", + ["pl.utils"] = "lua/pl/utils.lua", + ["pl.sip"] = "lua/pl/sip.lua", + ["pl.permute"] = "lua/pl/permute.lua", + ["pl.pretty"] = "lua/pl/pretty.lua", + ["pl.class"] = "lua/pl/class.lua", + ["pl.List"] = "lua/pl/List.lua", + ["pl.data"] = "lua/pl/data.lua", + ["pl.Date"] = "lua/pl/Date.lua", + ["pl.init"] = "lua/pl/init.lua", + ["pl.luabalanced"] = "lua/pl/luabalanced.lua", + ["pl.comprehension"] = "lua/pl/comprehension.lua", + ["pl.path"] = "lua/pl/path.lua", + ["pl.array2d"] = "lua/pl/array2d.lua", + ["pl.func"] = "lua/pl/func.lua", + ["pl.lapp"] = "lua/pl/lapp.lua", + ["pl.file"] = "lua/pl/file.lua", + ['pl.template'] = "lua/pl/template.lua", + ["pl.Map"] = "lua/pl/Map.lua", + ["pl.MultiMap"] = "lua/pl/MultiMap.lua", + ["pl.OrderedMap"] = "lua/pl/OrderedMap.lua", + ["pl.Set"] = "lua/pl/Set.lua", + ["pl.xml"] = "lua/pl/xml.lua", + ["pl.url"] = "lua/pl/url.lua", + ["pl.import_into"] = "lua/pl/import_into.lua", + ["pl.types"] = "lua/pl/types.lua", + }, + copy_directories = {"docs", "tests"} +} + |