Compare commits
No commits in common. "master" and "0.13.1" have entirely different histories.
@ -12,11 +12,10 @@ matrix:
|
||||
language: generic
|
||||
|
||||
install:
|
||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo pip2 install pyflakes pycodestyle coverage coveralls nose --ignore-installed; fi
|
||||
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pip install pyflakes pycodestyle coverage coveralls nose; fi
|
||||
- pip install pyflakes pep8 coverage coveralls nose
|
||||
|
||||
script:
|
||||
- pyflakes .
|
||||
- pycodestyle .
|
||||
- pep8 .
|
||||
- nosetests
|
||||
- coveralls
|
||||
|
||||
243
CHANGELOG.md
243
CHANGELOG.md
@ -1,243 +0,0 @@
|
||||
# Changelog
|
||||
|
||||
## 0.20.0 (2018-09-10)
|
||||
|
||||
### New features and improvements
|
||||
|
||||
* Added support for LuaRocks 3.0.0 - 3.0.2. `latest` and `^` aliases still
|
||||
point to `2.4.4`.
|
||||
* `--show` can now be used when installing programs; all programs present
|
||||
in the given location are listed after installation is complete.
|
||||
|
||||
### Fixes
|
||||
|
||||
* `package.path` for Lua 5.3+ built with hererocks now includes `./?/init.lua`,
|
||||
just as with standard Lua.
|
||||
|
||||
## 0.19.0 (2018-07-11)
|
||||
|
||||
### New features and improvements
|
||||
|
||||
* Added support for Lua 5.4.0-work1 and 5.4.0-work2.
|
||||
* Added support for Lua 5.3.5.
|
||||
* Added patches for Lua 5.3.4:
|
||||
|
||||
- `Lua crashes when building sequences with more than 2^30 elements`
|
||||
- `Table length computation overflows for sequences larger than 2^31
|
||||
elements`
|
||||
- `Memory-allocation error when resizing a table can leave it in an
|
||||
inconsistent state`
|
||||
|
||||
## 0.18.0 (2018-03-13)
|
||||
|
||||
### New features and improvements
|
||||
|
||||
* Added support for LuaRocks 2.4.4.
|
||||
* Using `3` as version when installing LuaRocks now uses master branch of the
|
||||
LuaRocks git repo instead of `luarocks-3`.
|
||||
* Added `lua_pushcclosure should not call the garbage collector when n is zero`
|
||||
patch for Lua 5.3.4.
|
||||
|
||||
## 0.17.0 (2017-09-13)
|
||||
|
||||
### New features and improvements
|
||||
|
||||
* Added support for LuaRocks 2.4.3.
|
||||
* When installing PUC-Rio Lua from a git repo or local sources, source files
|
||||
are expected to be in root directory instead of `src`. This allows one to
|
||||
install Lua from the default Lua repo at github.com/lua/lua.
|
||||
|
||||
## 0.16.0 (2017-06-10)
|
||||
|
||||
### New features and improvements
|
||||
|
||||
* Added support for LuaJIT 2.0.5 and 2.1.0-beta3.
|
||||
* Added fallback to a mirror for PUC-Rio Lua download.
|
||||
* Added `--timeout` option for downloads.
|
||||
|
||||
## 0.15.0 (2017-04-02)
|
||||
|
||||
### New features and improvements
|
||||
|
||||
* When building Lua with custom cflags, hererocks now instructs LuaRocks to use
|
||||
same flags when building C modules.
|
||||
|
||||
## 0.14.0 (2017-01-31)
|
||||
|
||||
### New features and improvements
|
||||
|
||||
* Added support for Lua 5.3.4.
|
||||
|
||||
## 0.13.1 (2017-01-09)
|
||||
|
||||
### Fixes
|
||||
|
||||
* Fixed an error when setting up cl.exe and hererocks has been installed using
|
||||
a version of pip that passes `prefix/hererocks` instead of
|
||||
`prefix/hererocks-script.py` as `sys.argv[0]`.
|
||||
|
||||
## 0.13.0 (2016-12-22)
|
||||
|
||||
### New features and improvements
|
||||
|
||||
* Added support for LuaRocks 2.4.2.
|
||||
* LuaRocks is now configured to allow using config in user home directory.
|
||||
In particular, API keys for `luarocks upload` command are now properly cached.
|
||||
|
||||
## 0.12.0 (2016-11-04)
|
||||
|
||||
### New features and improvements
|
||||
|
||||
* Added support for LuaRocks 2.4.1.
|
||||
* Updated URL for LuaRocks downloads and default git repo.
|
||||
|
||||
## 0.11.0 (2016-09-10)
|
||||
|
||||
### New features and improvements
|
||||
|
||||
* Added support for LuaRocks 2.4.0.
|
||||
* Added two new patches for bugs in Lua 5.3.3, try `--patch`.
|
||||
* Caching of downloads now works on Unix-like systems even when `$HOME` is
|
||||
unset (#28).
|
||||
|
||||
## 0.10.0 (2016-07-14)
|
||||
|
||||
### New features and improvements
|
||||
|
||||
* hererocks now creates activation scripts a-la virtualenv in `<location>/bin`.
|
||||
Bash, Zsh, Dash, Fish, Csh, Batch, and PowerShell are supported.
|
||||
* Lua 5.3.3 can now be patched to fix a bug (`Expression list with four or more
|
||||
expressions in a 'for' loop can crash the interpreter`), try `--patch`.
|
||||
|
||||
## 0.9.0 (2016-06-21)
|
||||
|
||||
### New features and improvements
|
||||
|
||||
* Added support for LuaRocks 2.0.13.
|
||||
|
||||
### Fixes
|
||||
|
||||
* Fixed occasional SHA256 mismatches when downloading LuaJIT (#27).
|
||||
|
||||
## 0.8.1 (2016-06-12)
|
||||
|
||||
### Fixes
|
||||
|
||||
* Fixed error when installing from non-default git repo on Windows.
|
||||
|
||||
## 0.8.0 (2016-06-07)
|
||||
|
||||
### New features and improvements
|
||||
|
||||
* Added support for Lua 5.3.3.
|
||||
|
||||
## 0.7.0 (2016-05-03)
|
||||
|
||||
### New features and improvements
|
||||
|
||||
* Windows support with automatic Visual Studio setup.
|
||||
* New values for `--target` option for selecting Visual Studio version and
|
||||
target architecture.
|
||||
* New `--show` option for listing programs installed in a location.
|
||||
* New `--patch` option for applying official patches for bugs in Lua (#21).
|
||||
* Documented `--downloads` and `--builds` options, may be useful for caching.
|
||||
|
||||
### Fixes
|
||||
|
||||
* Fixed an error when a command failed when using Python 3 (#15).
|
||||
* Fixed error when running with `HOME` environment variable undefined (#24).
|
||||
|
||||
## 0.6.2 (2016-03-22)
|
||||
|
||||
### Fixes
|
||||
|
||||
Fixed a bug that resulted in Lua being built without compatibility flags (#14).
|
||||
|
||||
## 0.6.1 (2016-03-22) [yanked]
|
||||
|
||||
## 0.6.0 (2016-03-20)
|
||||
|
||||
### Breaking changes
|
||||
|
||||
* `hererocks --luajit 2.1` now installs LuaJIT 2.1.0-beta2 instead of
|
||||
using v2.1 git branch. Use `hererocks --luajit @v2.1` to get old behaviour.
|
||||
|
||||
### New features and improvements
|
||||
|
||||
* LuaJIT versions 2.1.0-beta1 - 2.1.0-beta2 are now supported.
|
||||
* Lua is now built manually (`make` is not run).
|
||||
* OS X 10.4+ support for Lua 5.1.0 - 5.1.2.
|
||||
* SHA256 checksums for downloaded archives are now verified (#13).
|
||||
* `--no-readline` flag for building Lua without readline library.
|
||||
* Lua archives are now downloaded using HTTPS.
|
||||
|
||||
### Fixes
|
||||
|
||||
* `luajit.h` is installed for LuaJIT (#11, #12).
|
||||
* `jit.*` modules work correctly for LuaJIT 2.0.1.
|
||||
|
||||
## 0.5.0 (2016-01-11)
|
||||
|
||||
### New features and improvements
|
||||
|
||||
LuaRocks 2.3.0 is now supported.
|
||||
|
||||
## 0.4.0 (2016-01-03)
|
||||
|
||||
### New features and improvements
|
||||
|
||||
* Documented --no-git-cache option.
|
||||
|
||||
### Fixes
|
||||
|
||||
* Fixed error when installing Lua 5.1 on OS X, thanks to @xpol.
|
||||
|
||||
## 0.3.1 (2015-12-22)
|
||||
|
||||
### Fixes
|
||||
|
||||
* Fetch LuaJIT from GitHub mirror archive to avoid 'Connection refused' errors
|
||||
when installing it on Travis.
|
||||
|
||||
## 0.3.0 (2015-12-19)
|
||||
|
||||
### New features and improvements
|
||||
|
||||
* LuaRocks versions 2.0.8 - 2.0.12 are now supported.
|
||||
* `--compat=none` now turns off Lua 5.0 compatibility options when installing
|
||||
Lua 5.1
|
||||
* Default git repos are cached.
|
||||
* New `--cflags` option for adding custom compiler flags when compiling Lua and
|
||||
LuaJIT.
|
||||
|
||||
### Fixes
|
||||
|
||||
* LuaJIT `jit.*` modules are now properly installed.
|
||||
|
||||
## 0.2.0 (2015-12-02)
|
||||
|
||||
### New features and improvements
|
||||
|
||||
* Lua 5.3.2 is now supported.
|
||||
* Versions of installed programs are showed in status messages.
|
||||
|
||||
## 0.1.0 (2015-11-29)
|
||||
|
||||
### Breaking changes
|
||||
|
||||
* Removed `-c` and `-t` shortcuts.
|
||||
|
||||
### New features and improvements
|
||||
|
||||
* `--verbose` flag that prints commands hererocks runs.
|
||||
* hererocks now checks if requested versions are already installed, and skips
|
||||
installation in that case. Override using `--ignore-installed/-i` flag.
|
||||
* PUC Rio Lua now has default git URI.
|
||||
|
||||
### Fixes
|
||||
|
||||
* Installing from a git branch now works with newer git versions.
|
||||
|
||||
## 0.0.3 (2015-08-14)
|
||||
|
||||
The first release.
|
||||
2
LICENSE
2
LICENSE
@ -1,6 +1,6 @@
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2015 - 2017 Peter Melnichenko
|
||||
Copyright (c) 2015 - 2016 Peter Melnichenko
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
||||
@ -83,7 +83,7 @@ Version selection
|
||||
|
||||
``--lua/-l``, ``--luajit/-j`` and ``--luarocks/-r`` options select versions of programs to install. There are three ways to specify how to fetch the sources:
|
||||
|
||||
* Using version number, such as ``5.1.5``. If patch or minor versions are left out the latest possible version will be used, e.g. for Lua ``5.2`` is currently equivalent to ``5.2.4`` and for LuaJIT ``2.1`` is same as ``2.1.0-beta3``. ``latest`` or ``^`` can be used to select the latest stable version. ``hererocks`` will fetch and unpack sources of the selected version from corresponding downloads location, verifying their SHA256 checksum.
|
||||
* Using version number, such as ``5.1.5``. If patch or minor versions are left out the latest possible version will be used, e.g. for Lua ``5.2`` is currently equivalent to ``5.2.4`` and for LuaJIT ``2.1`` is same as ``2.1.0-beta2``. ``latest`` or ``^`` can be used to select the latest stable version. ``hererocks`` will fetch and unpack sources of the selected version from corresponding downloads location, verifying their SHA256 checksum.
|
||||
* Using git URI plus reference to checkout, separated by ``@``. Default reference is ``master``, and there are default git URIs for Lua (https://github.com/lua/lua), LuaJIT (https://github.com/luajit/luajit) and LuaRocks (https://github.com/luarocks/luarocks). For instance, ``--luajit @458a40b`` installs from a commit at the LuaJIT git repository and ``--luajit @`` installs from its master branch. ``hererocks`` will use ``git`` command for cloning.
|
||||
* Using path to a local directory.
|
||||
|
||||
@ -95,7 +95,7 @@ Lua and LuaJIT have some flags that add compatibility with other Lua versions. L
|
||||
Installing standard PUC-Rio Lua
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
Available versions: 5.1 - 5.1.5, 5.2.0 - 5.2.4, 5.3.0 - 5.3.5, 5.4.0-work1 - 5.4.0-work2 (5.4 and 5.4.0 are aliases for 5.4.0-work2). ``latest`` and ``^`` version aliases point to ``5.3.5``.
|
||||
Available versions: 5.1 - 5.1.5, 5.2.0 - 5.2.4, 5.3.0 - 5.3.3.
|
||||
|
||||
Use ``5.1.0`` to install Lua ``5.1`` which was released without patch version for some reason.
|
||||
|
||||
@ -104,12 +104,12 @@ When building Lua, ``hererocks`` tries to emulate a sensible ``make`` target. Th
|
||||
Installing LuaJIT
|
||||
^^^^^^^^^^^^^^^^^
|
||||
|
||||
Available versions: 2.0.0 - 2.0.5, 2.1.0-beta1 - 2.1.0-beta3. ``latest`` and ``^`` version aliases point to ``2.0.5``.
|
||||
Available versions: 2.0.0 - 2.0.4, 2.1.0-beta1 - 2.1.0-beta2.
|
||||
|
||||
Installing LuaRocks
|
||||
^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
Available versions: 2.0.8 - 2.0.13, 2.1.0 - 2.1.2, 2.2.0 - 2.2.2, 2.3.0, 2.4.0 - 2.4.4, 3.0.0 - 3.0.2. ``latest`` and ``^`` version aliases point to ``2.4.4``.
|
||||
Available versions: 2.0.8 - 2.0.13, 2.1.0 - 2.1.2, 2.2.0 - 2.2.2, 2.3.0, 2.4.0 - 2.4.2, 3 (installs from ``luarocks-3`` branch of the LuaRocks git repository).
|
||||
|
||||
Version 2.0.8 does not support Lua 5.2. Versions 2.0.8 - 2.1.2 do not support Lua 5.3.
|
||||
|
||||
|
||||
@ -7,11 +7,11 @@ environment:
|
||||
|
||||
build_script:
|
||||
- PATH %CD%\here\bin;C:\mingw\bin;C:\python%Python%;C:\python%Python%\scripts;%PATH%
|
||||
- pip install pyflakes pycodestyle coverage coveralls nose
|
||||
- pip install pyflakes pep8 coverage coveralls nose
|
||||
|
||||
test_script:
|
||||
- pyflakes .
|
||||
- pycodestyle .
|
||||
- pep8 .
|
||||
- nosetests
|
||||
- coverage report
|
||||
- if not "%COVERALLS_REPO_TOKEN%"=="" coveralls
|
||||
|
||||
844
hererocks.py
844
hererocks.py
File diff suppressed because it is too large
Load Diff
@ -1,2 +1,2 @@
|
||||
[pycodestyle]
|
||||
ignore = E203,E302,E305,E501
|
||||
[pep8]
|
||||
ignore = E203,E302,E501
|
||||
|
||||
5
setup.py
5
setup.py
@ -9,7 +9,7 @@ readme.close()
|
||||
|
||||
setuptools.setup(
|
||||
name="hererocks",
|
||||
version="0.20.0",
|
||||
version="0.13.1",
|
||||
description="Tool for installing Lua and LuaRocks locally",
|
||||
long_description=long_description,
|
||||
keywords="lua",
|
||||
@ -29,8 +29,7 @@ setuptools.setup(
|
||||
"Programming Language :: Python :: 3.3",
|
||||
"Programming Language :: Python :: 3.4",
|
||||
"Programming Language :: Python :: 3.5",
|
||||
"Programming Language :: Python :: 3.6",
|
||||
"Programming Language :: Python :: 3.7"
|
||||
"Programming Language :: Python :: 3.6"
|
||||
],
|
||||
py_modules=["hererocks"],
|
||||
entry_points={
|
||||
|
||||
@ -53,7 +53,7 @@ class TestCLI(unittest.TestCase):
|
||||
def test_install_latest_lua_with_latest_luarocks(self):
|
||||
self.assertHererocksSuccess(["--lua", "latest", "--luarocks", "latest"])
|
||||
self.assertHererocksSuccess(["--show"], ["Programs installed in", "Compat: default"])
|
||||
self.assertSuccess(["lua", "-v"], ["Lua 5.3.5"])
|
||||
self.assertSuccess(["lua", "-v"], ["Lua 5.3.3"])
|
||||
self.assertSuccess(["lua", "-e", "assert(bit32)"])
|
||||
|
||||
self.assertSuccess(["luarocks", "--version"])
|
||||
@ -66,11 +66,6 @@ class TestCLI(unittest.TestCase):
|
||||
def test_install_latest_lua_with_luarocks_from_git(self):
|
||||
self.assertHererocksSuccess(["--lua", "latest", "--luarocks", "https://github.com/mpeterv/luarocks@master"])
|
||||
|
||||
def test_install_lua_from_git_with_latest_luarocks(self):
|
||||
self.assertHererocksSuccess(["--lua", "@b1daa06", "--luarocks", "latest"])
|
||||
self.assertHererocksSuccess(["--show"], ["Programs installed in", "cloned from https://github.com/lua/lua"])
|
||||
self.assertSuccess(["luarocks", "--version"])
|
||||
|
||||
def test_verbose_install_bleeding_edge_luajit_with_latest_luarocks(self):
|
||||
self.assertHererocksSuccess(["--luajit", "@v2.1", "--luarocks", "latest", "--verbose"])
|
||||
self.assertSuccess(["lua", "-v"], ["LuaJIT 2.1.0"])
|
||||
@ -146,11 +141,3 @@ class TestCLI(unittest.TestCase):
|
||||
"activate 2: {}{}{}".format(path2, os.pathsep, path),
|
||||
"deactivate 2: {}".format(path)
|
||||
], from_prefix=False)
|
||||
|
||||
def test_install_lua_5_4_with_luarocks_3(self):
|
||||
self.assertHererocksSuccess(["--lua", "5.4", "--luarocks", "3"])
|
||||
self.assertHererocksSuccess(["--lua", "5.4.0-work1", "--luarocks", "3"])
|
||||
|
||||
if os.name == "nt":
|
||||
self.assertHererocksSuccess(["--lua", "5.4", "--luarocks", "3", "--target", "vs"])
|
||||
self.assertHererocksSuccess(["--lua", "5.4.0-work1", "--luarocks", "3", "--target", "vs"])
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user