Do the same on dev and on Travis

Makefile

@@ -16,12 +16,8 @@ VENV_FLAGS ?=
 
 REQUIREMENTS ?= dev-requirements.txt
 
-ifeq ($(CI),true)
-  PYTHON_VENV = do-pip
-  VENV_BIN =
-else
-  PYTHON_VENV=.venv/requirements-timestamp
-  ifeq ($(OPERATING_SYSTEM), WINDOWS)
+PYTHON_VENV=.venv/requirements-timestamp
+ifeq ($(OPERATING_SYSTEM), WINDOWS)
     export PGPASSWORD = $(PG_PASSWORD)
     VENV_BIN = .venv/Scripts/
     VENV_FLAGS += --system-site-packages
@@ -34,12 +30,11 @@ else
     PG_CREATE_EXT = "CREATE EXTENSION postgis;"
     PG_CREATE_SCHEMA = "CREATE SCHEMA plr;"
     REQUIREMENTS = dev-requirements-windows.txt
-  else
+else
     VENV_BIN ?= .venv/bin/
     PYTHON_BIN_POSTFIX =
     TESTS_SETUP_DB = tests-docker-setup-db
     TESTS_DROP_DB = tests-docker-drop-db
-  endif
 endif
 
 SPHINXOPTS =
@@ -63,10 +58,6 @@ install: $(PYTHON_VENV)
 	$(VENV_BIN)pip$(PYTHON_BIN_POSTFIX) install --editable .
 	touch $@
 
-.PHONY: do-pip
-do-pip:
-	pip install --requirement $(REQUIREMENTS) --editable .
-
 $(SPHINXBUILD): .venv/requirements-timestamp
 	$(VENV_BIN)pip$(PYTHON_BIN_POSTFIX) install Sphinx sphinxcontrib-napoleon sphinx_rtd_theme
 

setup.py

@@ -13,7 +13,7 @@
 
 setup(
     name='pyramid_oereb',
-    version='1.0.1',
+    version='1.1.0',
     description='pyramid_oereb, extension for pyramid web frame work to provide '
             'a basic server part for the oereb project',
     long_description='{readme}\n\n{changes}'.format(readme=README, changes=CHANGES),

travis/deploy-daily-pypi-build.sh

@@ -1,8 +1,5 @@
 #!/bin/bash -ex
 
-# Build the project
-make install
-
 # Prepare .pypirc config
 echo "[distutils]" > ~/.pypirc
 echo "index-servers = pypi" >> ~/.pypirc
@@ -12,4 +9,4 @@ echo "username:${TRAVIS_USERNAME}" >> ~/.pypirc
 echo "password:${TRAVIS_PASSWORD}" >> ~/.pypirc
 
 # Deploy daily pypi build
-.venv/bin/python setup.py egg_info --tag-date --tag-build=dev sdist bdist_wheel upload -r pypi
+python setup.py egg_info --tag-date --tag-build=dev sdist bdist_wheel upload -r pypi