Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #146 Add to docker matrix other interpreters #147

Open
wants to merge 39 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
f027d1f
Branch 0.25.1.dev based on skycoin/skycoin v0.25.0
olemis Jan 17, 2019
0e630e9
[stdevMac] refs #86 Add Python client for skycoin
stdevMac Jan 27, 2019
5e95d02
[stdevMac] refs #86 Update Makefile
stdevMac Mar 6, 2019
e294b86
[stdevMac] refs #86 Added Python wrapper for skycoin api v0.25.1
stdevMac Mar 10, 2019
7b3e022
[pyrest] refs #86 Set tox test
stdevMac Mar 12, 2019
fc9850b
[pyrest] refs #86 Set Makefile and .travis for pysky_api
stdevMac Mar 12, 2019
8bae203
Merge branch '0.25.dev' into stdevMac_t86_generate_python_api
stdevMac Mar 13, 2019
8f8d7d4
[restsharp] refs #86 Solving requested changes for PR
stdevMac Mar 13, 2019
6bad8d1
Merge branch 'stdevMac_t86_generate_python_api' of https://github.com…
stdevMac Mar 13, 2019
1b73050
Merge pull request #118 from simelo/stdevMac_t86_generate_python_api
olemis Mar 13, 2019
706180c
[skyapi] refs #86 Update Makefile to Patch openapi generated client
stdevMac Mar 13, 2019
4064564
[skyapi] refs #86 Added target for support specific Skycoin node
stdevMac Mar 13, 2019
867435f
[skyapi] refs #86 Update host options
stdevMac Mar 19, 2019
fe66872
[stdevMac] refs #127 Update Makefile
stdevMac Mar 30, 2019
8b35efb
[skyapi] refs #86 Update basic tests
stdevMac Apr 13, 2019
28a831e
[skyapi] refs #86 Updated skyapi library position in working dir
stdevMac Apr 13, 2019
b53df1f
[skyapi] refs #86 Update install-linux.sh for travis
stdevMac Apr 13, 2019
488e87b
[skyapi] refs #86 Updated MANIFEST.in for new location of skyapi
stdevMac Apr 14, 2019
e4bebd3
[skyapi] Updated pyenv in travis instalation
stdevMac Apr 14, 2019
2c1365b
Merge remote-tracking branch 'origin/0.25.dev' into stdevMac_t86_gene…
stdevMac Apr 14, 2019
a16db6f
[skyapi] refs #86 Updated pyenv for travis
stdevMac Apr 14, 2019
9e12e50
[skyapi] refs #86 Updated pyenv in osx installation
stdevMac Apr 14, 2019
a7aff6d
refs #86 - Single line in CHANGELOG
olemis Apr 26, 2019
8ece03e
[skyapi] refs #86 - Update top-level title in README
olemis Apr 26, 2019
ff67436
Merge pull request #125 from simelo/stdevMac_t86_generate_python_api
olemis Apr 26, 2019
a087d9a
[skyapi] refs #86 Updated skyapi for new swagger spec
stdevMac May 15, 2019
ee683b1
[skypai] refs #86 Updated skycoin contact
stdevMac May 15, 2019
eb8d93a
Merge pull request #137 from simelo/stdevMac_t86_generate_python_api
olemis May 15, 2019
2b74900
Merge remote-tracking branch 'origin/0.25.dev' into stdevMac_t143_wra…
stdevMac May 30, 2019
32de157
[skyapi] refs #143 Regenerated skyapi to 0.26.0
stdevMac May 30, 2019
5d1bfc8
Merge Dockerfile from stdevMac_t143_wrapper_skycoin_0.26.0
stdevMac May 31, 2019
94abefe
Revert "Merge Dockerfile from stdevMac_t143_wrapper_skycoin_0.26.0"
stdevMac May 31, 2019
0e4e274
[docker] refs #146 Merge dockerfile with virtualenvs
stdevMac Jun 4, 2019
27658ac
[docker] refs #146 Install python in dockerfile as arguments
stdevMac Jun 4, 2019
ab9033f
[docker] refs #146 install python using bash
stdevMac Jun 4, 2019
8c10f84
Merge branch
stdevMac Jun 4, 2019
e5d2be7
[docker] refs #146 install all from enviroment var
stdevMac Jun 4, 2019
a2be32a
Merge branch 'stdevMac_t146_docker_matrix_other_interpreters' of http…
stdevMac Jun 5, 2019
d1151f7
[docker] refs #146 Install jython pypy stackless activePython ironPyt…
stdevMac Jun 5, 2019
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ matrix:
- os: osx
languague: generic
env:
- PYTHON=2.7
- PYTHON=2.7.16
- TOXENV=py27
- os: osx
languague: generic
Expand Down
2 changes: 2 additions & 0 deletions .travis/install-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ chmod +x "$HOME/bin/gimme"
# Install Python libraries
$PIP install --upgrade pip setuptools tox-travis
$PIP install -r "$REPO_ROOT/requirements.dev.txt"
$PIP install -r "$REPO_ROOT/lib/skyapi/requirements.txt"
$PIP install -r "$REPO_ROOT/lib/skyapi/test-requirements.txt"

# Compile SWIG
mkdir swig_build && \
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## PySkycoin 0.25.1 - 2019/03/14

### Added

- Add `skyapi`, a wrapper for Skycoin node REST API at version 0.25.1

### Fixed

### Changed

### Removed

### Known issues

## PySkycoin 0.25.0 - 2019/01/01

### Added
Expand Down
6 changes: 5 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include requirements.dev.txt

include Makefile
include gopath/src/github.com/skycoin/skycoin/Makefile
recursive-exclude *.a
recursive-exclude . *.a
include skycoin.py

recursive-include . *.s
Expand All @@ -25,6 +25,10 @@ recursive-include gopath/src/github.com/skycoin/skycoin/include *
recursive-exclude . *.orig
exclude .github
exclude .travis
exclude lib/skyapi
exclude .pytest_cache
recursive-exclude .github *
recursive-exclude .travis *
recursive-exclude lib/skyapi *
recursive-exclude .pytest_cache *

22 changes: 15 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.DEFAULT_GOAL := help
.PHONY: configure build-libc build-swig develop build-libc-swig build
.PHONY: configure build-libc build-swig develop build-libc-swig build
.PHONY: test test-ci help

# Compilation output
.ONESHELL:
SHELL := /bin/bash

PYTHON_BIN = python
PYTHON = python
PWD = $(shell pwd)
GOPATH_DIR = $(PWD)/gopath
SKYCOIN_DIR = gopath/src/github.com/skycoin/skycoin
Expand All @@ -25,6 +25,8 @@ SRC_FILES = $(shell find $(SKYCOIN_DIR)/src -type f -name "*.go")
SWIG_FILES = $(shell find $(LIBSWIG_DIR) -type f -name "*.i")
HEADER_FILES = $(shell find $(SKYCOIN_DIR)/include -type f -name "*.h")

PYTHON_CLIENT_DIR = lib/skyapi

ifeq ($(shell uname -s),Linux)
TEMP_DIR = tmp
else ifeq ($(shell uname -s),Darwin)
Expand Down Expand Up @@ -65,24 +67,30 @@ build-swig: ## Generate Python C module from SWIG interfaces
swig -python -w501,505,401,302,509,451 -Iswig/include -I$(INCLUDE_DIR) -outdir ./skycoin/ -o swig/pyskycoin_wrap.c $(LIBSWIG_DIR)/pyskycoin.i

develop: ## Install PySkycoin for development
$(PYTHON_BIN) setup.py develop
$(PYTHON) setup.py develop
(cd $(PYTHON_CLIENT_DIR) && $(PYTHON) setup.py develop)

build-libc-swig: build-libc build-swig

build: build-libc-swig ## Build PySkycoin Python package
$(PYTHON_BIN) setup.py build
$(PYTHON) setup.py build
(cd $(PYTHON_CLIENT_DIR) && $(PYTHON) setup.py build)

test-ci: ## Run tests on (Travis) CI build
tox
(cd $(PYTHON_CLIENT_DIR) && tox)

test: build-libc build-swig develop ## Run project test suite
$(PYTHON_BIN) setup.py test
$(PYTHON) setup.py test
(cd $(PYTHON_CLIENT_DIR) && $(PYTHON) setup.py test)

sdist: ## Create source distribution archive
$(PYTHON_BIN) setup.py sdist --formats=gztar
$(PYTHON) setup.py sdist --formats=gztar
(cd $(PYTHON_CLIENT_DIR) && $(PYTHON) setup.py sdist --formats=gztar)

bdist_wheel: ## Create architecture-specific binary wheel distribution archive
$(PYTHON_BIN) setup.py bdist_wheel
$(PYTHON) setup.py bdist_wheel
(cd $(PYTHON_CLIENT_DIR) && $(PYTHON) setup.py bdist_wheel)

# FIXME: After libskycoin 32-bits binaries add bdist_manylinux_i686
bdist_manylinux: bdist_manylinux_amd64 ## Create multilinux binary wheel distribution archives
Expand Down
20 changes: 20 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ A Python extension generated with SWIG to access Skycoin API from Python.
- [Update the version](#update-the-version)
- [Pre-release testing](#pre-release-testing)
- [Creating release builds](#creating-release-builds)
- [Python wrapper for Skycoin Api](#python-wrapper-for-skycoin-api)
<!-- /MarkdownTOC -->

## Installation
Expand Down Expand Up @@ -252,3 +253,22 @@ python3 -m pip install --user --upgrade twine
twine upload --repository-url https://test.pypi.org/legacy/ dist/*
```

#### Python wrapper for Skycoin Api

This wrapper is Auto generated by openapi-generator directly from `Skycoin Api` code for version v0.25.1.

For further details of usage of `Python wrapper for Skycoin Api` see [Autogenerated documentation](./skyapi/README.md)

To use wrapper for specific node of Skycoin api, just do the next:

```python

# create an instance of the Configuration class
configuration = skyapi.Configuration()
# set new host
configuration.host = 'some_host'

# create an instance of the API class with new configuration
api_instance = skyapi.DefaultApi(skyapi.ApiClient(configuration))

```
Loading