From 19776ece1030135d5436e751c08a27be54c50455 Mon Sep 17 00:00:00 2001 From: amfl Date: Thu, 4 Apr 2019 19:08:40 +1300 Subject: [PATCH 1/2] Remove zope __init__.py workaround, not needed for py3.3+. It causes problems when zope is installed in a read-only location --- evennia/server/evennia_launcher.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py index 79e299a10e..dba0c13736 100644 --- a/evennia/server/evennia_launcher.py +++ b/evennia/server/evennia_launcher.py @@ -1295,18 +1295,6 @@ def check_main_evennia_dependencies(): if error: sys.exit() - # fix a common zope issue with a missing __init__ file - zope_interface = importlib.import_module("zope.interface") - expected_init_path = os.path.join( - os.path.dirname(os.path.dirname(zope_interface.__file__)), "__init__.py") - if not os.path.exists(expected_init_path): - # add an empty missing __init__.py file to fix the problem - with open(expected_init_path, 'w') as zope_init_file: - zope_init_file.write("") - print("Note: zope_interface.__init__.py not found. This is a known issue with that package." - "\nEvennia auto-created it at {}.".format( - expected_init_path)) - # return True/False if error was reported or not return not error From c05b00c19b107dc4ff288baa431dfa4cb4451fa6 Mon Sep 17 00:00:00 2001 From: amfl Date: Thu, 4 Apr 2019 19:11:24 +1300 Subject: [PATCH 2/2] Update Dockerfile to python3 Changed from alpine -> python:3.7-alpine due to alpine only having python3.6 in repos. Some packages have changed as a result. --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 94f6ce6767..6f44989d44 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,13 +27,13 @@ # as a base for creating your own custom containerized Evennia game. For more # info, see https://github.com/evennia/evennia/wiki/Running%20Evennia%20in%20Docker . # -FROM alpine +FROM python:3.7-alpine LABEL maintainer="www.evennia.com" # install compilation environment -RUN apk update && apk add bash gcc jpeg-dev musl-dev procps py-pip \ -py-setuptools py2-openssl python python-dev zlib-dev gettext +RUN apk update && apk add bash gcc jpeg-dev musl-dev procps \ +libffi-dev openssl-dev zlib-dev gettext # add the files required for pip installation COPY ./setup.py /usr/src/evennia/