Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,14 @@ matrix:
env: TOX_POSARGS="-e py35" SOLC_VERSION=v0.4.24
- python: "3.6"
env: TOX_POSARGS="-e py36" SOLC_VERSION=v0.4.24
# solc 0.4.25
- python: "3.4"
env: TOX_POSARGS="-e py34" SOLC_VERSION=v0.4.25
- python: "3.5"
env: TOX_POSARGS="-e py35" SOLC_VERSION=v0.4.25
- python: "3.6"
env: TOX_POSARGS="-e py36" SOLC_VERSION=v0.4.25

cache:
- pip: true
before_install:
Expand Down
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -198,24 +198,25 @@ listed platforms.
* `v0.4.22` (linux/osx)
* `v0.4.23` (linux/osx)
* `v0.4.24` (linux/osx)
* `v0.4.25` (linux/osx)

Installation can be done via the command line:

```bash
$ python -m solc.install v0.4.24
$ python -m solc.install v0.4.25
```

Or from python using the `install_solc` function.

```python
>>> from solc import install_solc
>>> install_solc('v0.4.24')
>>> install_solc('v0.4.25')
```

The installed binary can be found under your home directory. The `v0.4.24`
binary would be located at `$HOME/.py-solc/solc-v0.4.24/bin/solc`. Older linux
The installed binary can be found under your home directory. The `v0.4.25`
binary would be located at `$HOME/.py-solc/solc-v0.4.25/bin/solc`. Older linux
installs will also require that you set the environment variable
`LD_LIBRARY_PATH=$HOME/.py-solc/solc-v0.4.24/bin`
`LD_LIBRARY_PATH=$HOME/.py-solc/solc-v0.4.25/bin`


## Import path remappings
Expand Down
5 changes: 5 additions & 0 deletions solc/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
V0_4_22 = 'v0.4.22'
V0_4_23 = 'v0.4.23'
V0_4_24 = 'v0.4.24'
V0_4_25 = 'v0.4.25'


LINUX = 'linux'
Expand Down Expand Up @@ -412,6 +413,7 @@ def install_from_static_linux(identifier):
install_v0_4_22_linux = functools.partial(install_solc_from_static_linux, V0_4_22)
install_v0_4_23_linux = functools.partial(install_solc_from_static_linux, V0_4_23)
install_v0_4_24_linux = functools.partial(install_solc_from_static_linux, V0_4_24)
install_v0_4_25_linux = functools.partial(install_solc_from_static_linux, V0_4_25)


def install_from_source(identifier):
Expand Down Expand Up @@ -439,6 +441,7 @@ def install_from_source(identifier):
install_v0_4_22_osx = functools.partial(install_from_source, V0_4_22)
install_v0_4_23_osx = functools.partial(install_from_source, V0_4_23)
install_v0_4_24_osx = functools.partial(install_from_source, V0_4_24)
install_v0_4_25_osx = functools.partial(install_from_source, V0_4_25)


INSTALL_FUNCTIONS = {
Expand All @@ -463,6 +466,7 @@ def install_from_source(identifier):
V0_4_22: install_v0_4_22_linux,
V0_4_23: install_v0_4_23_linux,
V0_4_24: install_v0_4_24_linux,
V0_4_25: install_v0_4_25_linux,
},
OSX: {
V0_4_8: install_v0_4_8_osx,
Expand All @@ -480,6 +484,7 @@ def install_from_source(identifier):
V0_4_22: install_v0_4_22_osx,
V0_4_23: install_v0_4_23_osx,
V0_4_24: install_v0_4_24_osx,
V0_4_25: install_v0_4_25_osx,
}
}

Expand Down
2 changes: 1 addition & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def solc_version():

@pytest.fixture()
def supported_solc_version(solc_version):
if solc_version not in Spec('>=0.4.1,<=0.4.17,!=0.4.10,!=0.4.3,!=0.4.4,!=0.4.5'):
if solc_version not in Spec('>=0.4.1,<=0.4.25,!=0.4.10,!=0.4.3,!=0.4.4,!=0.4.5'):
raise AssertionError("Unsupported compiler version: {0}".format(solc_version))

return solc_version
Expand Down