Skip to content

Commit

Permalink
pyln-testing: Bump version to 0.9.0 and add Makefile for release
Browse files Browse the repository at this point in the history
  • Loading branch information
cdecker committed Aug 30, 2020
1 parent 0b50fd0 commit 71e713c
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 2 deletions.
46 changes: 46 additions & 0 deletions contrib/pyln-testing/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
#! /usr/bin/make

.PHONY: bdist sdist release check check-source check-flake8 check-mypy
VERSION = $(shell python3 -c 'from pyln import testing;print(testing.__version__)')

SDIST_FILE = "dist/pyln-testing-$(VERSION).tar.gz"
BDIST_FILE = "dist/pyln_testing-$(VERSION)-py3-none-any.whl"
ARTEFACTS = $(BDIST_FILE) $(SDIST_FILE)

check:
# pytest

check-source: check-flake8 check-mypy

check-flake8:
flake8 --ignore=E501,E731,W503

# mypy . does not recurse. I have no idea why...
check-mypy:
mypy --ignore-missing-imports `find pyln/testing -name '*.py'`

$(SDIST_FILE):
python3 setup.py sdist

$(BDIST_FILE):
python3 setup.py bdist_wheel

test-release: check $(ARTEFACTS)
python3 -m twine upload --repository testpypi --skip-existing $(ARTEFACTS)

# Create a test virtualenv, install from the testpypi and run the
# tests against it (make sure not to use any virtualenv that may have
# pyln-testing already installed).
virtualenv testpypi --python=/usr/bin/python3 --download --always-copy --clear
# Install the requirements from the prod repo, they are not being kept up to date on the test repo
testpypi/bin/python3 -m pip install -r requirements.txt flaky pytest-timeout
testpypi/bin/python3 -m pip install -I --index-url https://test.pypi.org/simple/ --no-deps pyln-testing
testpypi/bin/python3 -c "from pyln import testing;assert(testing.__version__ == '$(VERSION)')"
testpypi/bin/pytest tests
rm -rf testpypi

prod-release: test-release $(ARTEFACTS)
python3 -m twine upload $(ARTEFACTS)

clean:
rm -rf testpypi
2 changes: 1 addition & 1 deletion contrib/pyln-testing/pyln/testing/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.0.2"
__version__ = "0.9.0"
3 changes: 2 additions & 1 deletion contrib/pyln-testing/pyln/testing/fixtures.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from concurrent import futures
from pyln.testing.db import SqliteDbProvider, PostgresDbProvider
from pyln.testing.utils import NodeFactory, BitcoinD, ElementsD, env, DEVELOPER, LightningNode, TEST_DEBUG
from typing import Dict

import logging
import os
Expand All @@ -13,7 +14,7 @@

# A dict in which we count how often a particular test has run so far. Used to
# give each attempt its own numbered directory, and avoid clashes.
__attempts = {}
__attempts: Dict[str, int] = {}


@pytest.fixture(scope="session")
Expand Down

0 comments on commit 71e713c

Please sign in to comment.