Skip to content
This repository has been archived by the owner on May 15, 2020. It is now read-only.

Commit

Permalink
Merge pull request #81 from kpn/feature/fix-build
Browse files Browse the repository at this point in the history
FIX: Build on travis
  • Loading branch information
mjholtkamp authored Feb 13, 2020
2 parents 8b7b752 + 98ef706 commit 996001f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- stage: test
language: python
python:
- "3.7-dev"
- "3.8"
before_install:
- pip install --upgrade pip
install:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.7.1
FROM python:3.8.1

ENV IN_DOCKER 1
ENV PYTHONUNBUFFERED 1
Expand All @@ -11,4 +11,4 @@ COPY requirements.txt .
COPY requirements requirements
RUN make install_requirement_txt

CMD ["make", "test"]
CMD ["make", "test"]
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This Makefile requires the following commands to be available:
# * virtualenv
# * python3.7.1
# * python3.8
# * docker

IMAGE=katka-core
Expand All @@ -10,7 +10,7 @@ REQUIREMENTS_BASE:=requirements/requirements-base.txt
REQUIREMENTS_TEST:=requirements/requirements-testing.txt
REQUIREMENTS_TXT:=requirements.txt

PYTHON_VERSION=python3.7
PYTHON_VERSION=python3.8

BLACK="black"
FLAKE8="flake8"
Expand All @@ -27,7 +27,7 @@ ifneq ($(IN_DOCKER), 1)
ISORT="venv/bin/isort"
PIP="venv/bin/pip"
TOX="venv/bin/tox"
PYTHON="venv/bin/$(PYTHON_VERSION)"
PYTHON="venv/bin/python"
TWINE="venv/bin/twine"
endif

Expand Down Expand Up @@ -84,7 +84,7 @@ docker/push/%:
docker push $(DOCKER_REPOSITORY)/$(IMAGE):$*

docker/%: docker/build
docker run --rm -v $(PWD):$(PWD) -w $(PWD) $(DOCKER_REPOSITORY)/$(IMAGE) make $*
docker run --rm -v $(PWD):$(PWD) --tmpfs $(PWD)/.tox:exec -w $(PWD) $(DOCKER_REPOSITORY)/$(IMAGE) make $*

docker/publish: docker/build
docker run --rm -v $(PWD):$(PWD) -w $(PWD) \
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
addopts=--tb=short --ds=tests.settings

[tox]
envlist = py37
envlist = py37,py38
skipsdist=True

[testenv]
Expand Down

0 comments on commit 996001f

Please sign in to comment.