Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: theQRL/QRL
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.0.6
Choose a base ref
...
head repository: theQRL/QRL
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
4 contributors
Loading
80 changes: 36 additions & 44 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ version: 2
jobs:
build:
docker:
- image: qrledger/qrl-docker-ci:xenial
- image: qrledger/qrl-docker-ci:bionic
steps:
- checkout
- run: pip install -U setuptools
@@ -14,7 +14,7 @@ jobs:

test_leaks_CLI:
docker:
- image: qrledger/qrl-docker-ci:xenial
- image: qrledger/qrl-docker-ci:bionic
steps:
- checkout
- run: pip install -U setuptools
@@ -25,15 +25,15 @@ jobs:

flake8:
docker:
- image: qrledger/qrl-docker-ci:xenial
- image: qrledger/qrl-docker-ci:bionic
steps:
- checkout
- run: pip install -U setuptools
- run: flake8

test_leaks_other:
docker:
- image: qrledger/qrl-docker-ci:xenial
- image: qrledger/qrl-docker-ci:bionic
steps:
- checkout
- run: pip install -U setuptools
@@ -42,17 +42,6 @@ jobs:
- run: pip install -U pytest-openfiles pytest-leaks pytest-threadleak pytest-repeat
- run: python3 setup.py test --addopts "--ignore=tests/tools/ --ignore=tests/daemon/ --ignore=tests/services/test_WalletAPIService.py --open-files --threadleak -n0"

build_trusty:
docker:
- image: qrledger/qrl-docker-ci:trusty
steps:
- checkout
- run: pip install -U setuptools
- run: pip install -U -r requirements.txt
- run: pip install -U -r test-requirements.txt
- run: python3 --version
- run: python3 setup.py test

build_bionic:
docker:
- image: qrledger/qrl-docker-ci:bionic
@@ -65,7 +54,7 @@ jobs:

integration_fast:
docker:
- image: qrledger/qrl-docker-ci:xenial
- image: qrledger/qrl-docker-ci:bionic
environment:
PYTHONPATH: /root/project:/root/project/tests_integration
TESTINPLACE: 1
@@ -79,12 +68,14 @@ jobs:

integration_smoke:
docker:
- image: qrledger/qrl-docker-ci:xenial
- image: qrledger/qrl-docker-ci:bionic
environment:
PYTHONPATH: /root/project:/root/project/tests_integration
TESTINPLACE: 1
steps:
- checkout
- run: apt-get update
- run: apt-get install -y rsync
- run: git submodule update --init --recursive --remote
- run: apt install -y python3-venv
- run: pip install -U -r requirements.txt
@@ -94,31 +85,32 @@ jobs:
- run: pytest tests_integration/tests/python/fork_recovery
- run: pytest tests_integration/tests/python/fastnet_short

integration_fuzzing:
docker:
- image: qrledger/qrl-docker-ci:xenial
environment:
PYTHONPATH: /root/project:/root/project/tests_integration
TESTINPLACE: 1
steps:
- checkout
- run: apt-get -y remove python3-dev python3-pip python3-venv --purge
- run: add-apt-repository ppa:deadsnakes/ppa -y
- run: apt-get update
- run: apt-get -y install python3.6 python3.6-dev python3-pip python3.6-venv
- run: update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.6 1
- run: python3 -m pip install
- run: python3 -m pip install -U pip setuptools
- run: git submodule update --init --recursive --remote
- run: python3 -m pip install -U -r requirements.txt
- run: python3 -m pip install -U -r test-requirements.txt
- run: python3 -m pip install -U -r tests_integration/requirements.txt
- run: python3 -m pip install git+https://github.com/CurataEng/hypothesis-protobuf.git
- run: pytest tests_integration/tests/python/fuzzing
# Disabled fuzzing test as it has an outdated/unmaintained dependency
# integration_fuzzing:
# docker:
# - image: qrledger/qrl-docker-ci:xenial
# environment:
# PYTHONPATH: /root/project:/root/project/tests_integration
# TESTINPLACE: 1
# steps:
# - checkout
# - run: apt-get -y remove python3-dev python3-pip python3-venv --purge
# - run: add-apt-repository ppa:deadsnakes/ppa -y
# - run: apt-get update
# - run: apt-get -y install python3.6 python3.6-dev python3-pip python3.6-venv
# - run: update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.6 1
# - run: python3 -m pip install
# - run: python3 -m pip install -U pip setuptools
# - run: git submodule update --init --recursive --remote
# - run: python3 -m pip install -U -r requirements.txt
# - run: python3 -m pip install -U -r test-requirements.txt
# - run: python3 -m pip install -U -r tests_integration/requirements.txt
# - run: python3 -m pip install git+https://github.com/CurataEng/hypothesis-protobuf.git
# - run: pytest tests_integration/tests/python/fuzzing

deploy-pypi:
docker:
- image: qrledger/qrl-docker-ci:xenial
- image: qrledger/qrl-docker-ci:bionic
steps:
- checkout
- run: git submodule update --init --recursive
@@ -160,10 +152,10 @@ workflows:
tags:
only: /.*/

- integration_fuzzing:
filters:
tags:
only: /.*/
# - integration_fuzzing:
# filters:
# tags:
# only: /.*/

- deploy-pypi:
requires:
@@ -173,7 +165,7 @@ workflows:
#- test_leaks_CLI
- test_leaks_other
- integration_smoke
- integration_fuzzing
# - integration_fuzzing
filters:
branches:
ignore: /.*/
3 changes: 1 addition & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -3,8 +3,7 @@
[![PyPI version](https://badge.fury.io/py/qrl.svg)](https://badge.fury.io/py/qrl)
[![CircleCI](https://circleci.com/gh/theQRL/QRL.svg?style=shield)](https://circleci.com/gh/theQRL/QRL)
[![CircleCI](https://img.shields.io/circleci/project/github/theQRL/integration_tests/master.svg?label=integration)](https://circleci.com/gh/theQRL/integration_tests)
[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/e3070763b579456380822b2909259070)](https://www.codacy.com/app/qrl/QRL?utm_source=github.com&utm_medium=referral&utm_content=theQRL/QRL&utm_campaign=Badge_Coverage)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/e3070763b579456380822b2909259070)](https://www.codacy.com/app/qrl/QRL?utm_source=github.com&utm_medium=referral&utm_content=theQRL/QRL&utm_campaign=Badge_Grade)
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/d1d2abd66d7546c0aac551b7abb8d87e)](https://www.codacy.com/gh/theQRL/QRL/dashboard?utm_source=github.com&utm_medium=referral&utm_content=theQRL/QRL&utm_campaign=Badge_Grade)
[![codebeat badge](https://codebeat.co/badges/5748b416-7398-4d08-8b49-e4285ef9a82d)](https://codebeat.co/projects/github-com-theqrl-qrl-master)
[![Snyk Vulnerability Analysis](https://snyk.io/test/github/theQRL/QRL/badge.svg)](https://snyk.io/test/github/theQRL/QRL)

29 changes: 16 additions & 13 deletions requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
# Fixing sphinx version due to https://github.com/sphinx-doc/sphinx/issues/3976
setuptools==50.3.2
plyvel==1.2.0
# setuptools==50.3.2 # It needs to be installed manually in some cases
plyvel>=1.2.0,<=1.4.0
ntplib==0.3.4
Twisted>=19.10.0
Twisted==20.3.0
colorlog==3.1.0
simplejson==3.11.1
PyYAML==5.3.1
grpcio-tools>=1.9.0,<=1.27.2
grpcio>=1.9.0,<=1.27.2
grpcio-tools>=1.9.0,<=1.50.0
grpcio>=1.9.0,<=1.50.0
google-api-python-client==1.8.3
google-auth<2.0dev,>=1.21.1
httplib2>=0.15.0
service_identity==17.0.0
protobuf==3.12.0
protobuf>3.19.0,<=3.20.3
pyopenssl==17.5.0
six==1.13.0
click==6.7
pyqrllib>=0.99.3,<1.3.0
pyqryptonight>=0.99.3,<1.1.0
pyqrandomx>=0.0.0,<1.0.0
Flask>=1.0.0
json-rpc==1.10.8
click==8.0
pyqrllib>=1.2.3,<1.3.0
pyqryptonight>=0.99.9
pyqrandomx>=0.3.0,<1.0.0
Flask>=2.0.0,<=2.2.2
json-rpc==1.13.0
idna==2.6
cryptography==2.3
mock==2.0.0
mock>=2.0.0
daemonize==2.4.7
35 changes: 19 additions & 16 deletions setup.cfg
View file
Original file line number Diff line number Diff line change
@@ -25,35 +25,38 @@ package_dir =
# Add here dependencies of your project (semicolon-separated), e.g.
# install_requires = numpy; scipy
install_requires =
setuptools==50.3.2
plyvel==1.2.0
# setuptools==50.3.2
plyvel>=1.2.0,<=1.4.0
ntplib==0.3.4
Twisted>=19.10.0
Twisted==20.3.0
colorlog==3.1.0
simplejson==3.11.1
PyYAML==5.3.1
grpcio-tools>=1.9.0,<=1.27.2
grpcio>=1.9.0,<=1.27.2
grpcio-tools>=1.9.0,<=1.50.0
grpcio>=1.9.0,<=1.50.0
google-api-python-client==1.8.3
google-auth<2.0dev,>=1.21.1
httplib2>=0.15.0
service_identity==17.0.0
protobuf==3.12.0
protobuf>3.19.0,<=3.20.3
pyopenssl==17.5.0
six==1.13.0
click==6.7
pyqrllib>=0.99.3,<1.3.0
pyqryptonight>=0.99.3,<1.1.0
pyqrandomx>=0.0.0,<1.0.0
Flask>=1.0.0
json-rpc==1.10.8
click==8.0
pyqrllib>=1.2.3,<1.3.0
pyqryptonight>=0.99.9
pyqrandomx>=0.3.0,<1.0.0
Flask>=2.0.0,<=2.2.2
json-rpc==1.13.0
idna==2.6
cryptography==2.3
mock==2.0.0
mock>=2.0.0
daemonize==2.4.7

# Add here test requirements (semicolon-separated)
tests_require =
pytest==3.6
pytest-cov==2.5.1
pytest-xdist==1.22.2
pytest>=7.0.0,<=7.1.3
pytest-cov==4.0.0
pytest-xdist==2.5.0
pytest-flake8==1.0.0
flake8==3.5.0
autoflake==1.1
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@
def setup_package():
needs_sphinx = {'build_sphinx', 'upload_docs'}.intersection(sys.argv)
sphinx = ['sphinx'] if needs_sphinx else []
setup(setup_requires=['pyscaffold>=3.0a0,<3.1a0'] + sphinx,
setup(setup_requires=['pyscaffold==3.0.2'] + sphinx,
entry_points=entry_points,
version=versioneer.get_version(),
cmdclass=versioneer.get_cmdclass(),
Loading