diff --git a/requirements.txt b/requirements.txt index c1e31a9014..b74f94bbb9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ -# Evennia dependencies. If using pip, this file can be used to install -# dependencies directly, using 'pip install -r requirements.txt'. +# Evennia dependencies, for Linux/Mac platforms django >= 1.7 twisted >= 12.0 diff --git a/setup.py b/setup.py index b0057fff93..40a250ccbc 100644 --- a/setup.py +++ b/setup.py @@ -5,13 +5,16 @@ from setuptools import setup, find_packages os.chdir(os.path.dirname(os.path.realpath(__file__))) VERSION_PATH = os.path.join('evennia', 'VERSION.txt') - +OS_WINDOWS = os.name == "nt" def get_requirements(): """ - To update the requirements for Evennia, edit the requirements.txt file. + To update the requirements for Evennia, edit the requirements.txt + file, or win_requirements.txt for Windows platforms. """ - req_lines = open('requirements.txt', 'r').readlines() + filename = 'win_requirements.txt' if OS_WINDOWS else 'requirements.txt' + with open(filename, 'r') as f: + req_lines = f.readlines() reqs = [] for line in req_lines: # Avoid adding comments. @@ -26,7 +29,7 @@ def get_scripts(): Determine which executable scripts should be added. For Windows, this means creating a .bat file. """ - if os.name == "nt": + if OS_WINDOWS: batpath = os.path.join("bin", "windows", "evennia.bat") scriptpath = os.path.join(sys.prefix, "Scripts", "evennia_launcher.py") with open(batpath, "w") as batfile: diff --git a/win_requirements.txt b/win_requirements.txt new file mode 100644 index 0000000000..b2c56523ef --- /dev/null +++ b/win_requirements.txt @@ -0,0 +1,10 @@ +# Evennia dependencies, for Windows platform + +# windows specific +pypiwin32 +psutil >= 2.2 +# general +django >= 1.7 +twisted >= 12.0 +mock >= 1.0.1 +pillow