Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve merge conflicts

Browse source
This commit is contained in:
Griatch 2019-09-15 13:02:35 +02:00
commit 02a391d308
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
requirements.txt
View file

@ -1,4 +1,4 @@
# Evennia dependencies, for Linux/Mac platforms # Evennia dependencies
# general # general
django >= 2.2.5, < 2.3 django >= 2.2.5, < 2.3
@ -13,3 +13,6 @@ model_mommy
# testing # testing
mock >= 1.0.1 mock >= 1.0.1
anything anything
# windows-specific
pypiwin32;platform_system=="Windows"

6
setup.py
View file

@ -10,11 +10,9 @@ OS_WINDOWS = os.name == "nt"
def get_requirements(): def get_requirements():
""" """
To update the requirements for Evennia, edit the requirements.txt To update the requirements for Evennia, edit the requirements.txt file.
file, or win_requirements.txt for Windows platforms.
""" """
filename = 'win_requirements.txt' if OS_WINDOWS else 'requirements.txt' with open('requirements.txt', 'r') as f:
with open(filename, 'r') as f:
req_lines = f.readlines() req_lines = f.readlines()
reqs = [] reqs = []
for line in req_lines: for line in req_lines: