More unwinding of looking up external hostnames. Correct pid kill behaviour. Add PyPI index option to makefile

Author: eeaston

Makefile

@@ -17,18 +17,21 @@ EXTRA_DEPS = setuptools-git \
 
 COPY_FILES = VERSION CHANGES.md common_setup.py MANIFEST.in LICENSE
 UPLOAD_OPTS =
+PYPI_INDEX =
+
+PIP_INSTALL_ARGS := $(shell [ ! -z "${PYPI_INDEX}" ] && echo --index ${PYPI_INDEX} )
 
 # removed from PHONY:  circleci_sip circleci_pyqt
 .PHONY: extras copyfiles wheels eggs sdists install develop test upload clean
 
 extras:
-	pip install $(EXTRA_DEPS)
+	pip install ${PIP_INSTALL_ARGS} ${EXTRA_DEPS}
 
 copyfiles:
-	./foreach.sh 'for file in $(COPY_FILES); do cp ../$$file .; done'
+	./foreach.sh 'for file in ${COPY_FILES}; do cp ../$$file .; done'
 
 wheels: copyfiles
-	pip install -U wheel
+	pip install ${PIP_INSTALL_ARGS} -U wheel
 	./foreach.sh --changed 'python setup.py bdist_wheel'
 
 eggs: copyfiles
@@ -38,12 +41,12 @@ sdists: copyfiles
 	./foreach.sh --changed 'python setup.py sdist'
 
 install: copyfiles
-	pip install -U wheel
+	pip install ${PIP_INSTALL_ARGS} -U wheel
 	./foreach.sh 'python setup.py bdist_wheel'
-	./foreach.sh 'pip install dist/*.whl'
+	./foreach.sh 'pip install ${PIP_INSTALL_ARGS} dist/*.whl'
 
 develop: copyfiles extras
-	./foreach.sh 'pip install -e.[tests]'
+	./foreach.sh 'pip install ${PIP_INSTALL_ARGS} -e.[tests]'
 
 test:
 	rm -f FAILED-*

pytest-pyramid-server/pytest_pyramid_server.py

@@ -112,8 +112,8 @@ def pre_setup(self):
         except configparser.NoOptionError:
             parser.set('app:main', 'url_prefix', '')
 
-        # Set the uri to be the external hostname and the url prefix
-        self._uri = "http://%s:%s/%s" % (os.uname()[1], self.port, parser.get('app:main', 'url_prefix'))
+        # Set the uri to be the hostname and the url prefix
+        self._uri = "http://%s:%s/%s" % (self.hostname, self.port, parser.get('app:main', 'url_prefix'))
 
     @property
     def run_cmd(self):

pytest-server-fixtures/pytest_server_fixtures/httpd.py

@@ -159,11 +159,16 @@ def pre_setup(self):
 
     @property
     def pid(self):
-        return int((self.workspace / 'run' / 'httpd.pid').read_text())
+        try:
+            return int((self.workspace / 'run' / 'httpd.pid').read_text())
+        except FileNotFoundError:
+            return None
 
     @property
     def run_cmd(self):
         return [CONFIG.httpd_executable, '-f', self.config]
 
     def kill(self, retries=5):
-        self.kill_by_pid(self.pid, retries)
+        pid = self.pid
+        if pid is not None:
+            self.kill_by_pid(self.pid, retries)