mirror of
				https://github.com/matrix-org/synapse.git
				synced 2025-11-04 02:01:03 +01:00 
			
		
		
		
	Miscellaneous fixes to python_dependencies
* add some doc about wtf this thing does * pin Twisted to < 18.4 * add explicit dep on six (fixes #3089)
This commit is contained in:
		
							parent
							
								
									dc875d2712
								
							
						
					
					
						commit
						d78ada3166
					
				@ -1,5 +1,6 @@
 | 
			
		||||
# Copyright 2015, 2016 OpenMarket Ltd
 | 
			
		||||
# Copyright 2017 Vector Creations Ltd
 | 
			
		||||
# Copyright 2018 New Vector Ltd
 | 
			
		||||
#
 | 
			
		||||
# Licensed under the Apache License, Version 2.0 (the "License");
 | 
			
		||||
# you may not use this file except in compliance with the License.
 | 
			
		||||
@ -18,6 +19,18 @@ from distutils.version import LooseVersion
 | 
			
		||||
 | 
			
		||||
logger = logging.getLogger(__name__)
 | 
			
		||||
 | 
			
		||||
# this dict maps from python package name to a list of modules we expect it to
 | 
			
		||||
# provide.
 | 
			
		||||
#
 | 
			
		||||
# the key is a "requirement specifier", as used as a parameter to `pip
 | 
			
		||||
# install`[1], or an `install_requires` argument to `setuptools.setup` [2].
 | 
			
		||||
#
 | 
			
		||||
# the value is a sequence of strings; each entry should be the name of the
 | 
			
		||||
# python module, optionally followed by a version assertion which can be either
 | 
			
		||||
# ">=<ver>" or "==<ver>".
 | 
			
		||||
#
 | 
			
		||||
# [1] https://pip.pypa.io/en/stable/reference/pip_install/#requirement-specifiers.
 | 
			
		||||
# [2] https://setuptools.readthedocs.io/en/latest/setuptools.html#declaring-dependencies
 | 
			
		||||
REQUIREMENTS = {
 | 
			
		||||
    "jsonschema>=2.5.1": ["jsonschema>=2.5.1"],
 | 
			
		||||
    "frozendict>=0.4": ["frozendict"],
 | 
			
		||||
@ -26,7 +39,11 @@ REQUIREMENTS = {
 | 
			
		||||
    "signedjson>=1.0.0": ["signedjson>=1.0.0"],
 | 
			
		||||
    "pynacl>=1.2.1": ["nacl>=1.2.1", "nacl.bindings"],
 | 
			
		||||
    "service_identity>=1.0.0": ["service_identity>=1.0.0"],
 | 
			
		||||
    "Twisted>=16.0.0": ["twisted>=16.0.0"],
 | 
			
		||||
 | 
			
		||||
    # we break under Twisted 18.4
 | 
			
		||||
    # (https://github.com/matrix-org/synapse/issues/3135)
 | 
			
		||||
    "Twisted>=16.0.0,<18.4": ["twisted>=16.0.0"],
 | 
			
		||||
 | 
			
		||||
    "pyopenssl>=0.14": ["OpenSSL>=0.14"],
 | 
			
		||||
    "pyyaml": ["yaml"],
 | 
			
		||||
    "pyasn1": ["pyasn1"],
 | 
			
		||||
@ -39,6 +56,7 @@ REQUIREMENTS = {
 | 
			
		||||
    "pymacaroons-pynacl": ["pymacaroons"],
 | 
			
		||||
    "msgpack-python>=0.3.0": ["msgpack"],
 | 
			
		||||
    "phonenumbers>=8.2.0": ["phonenumbers"],
 | 
			
		||||
    "six": ["six"],
 | 
			
		||||
}
 | 
			
		||||
CONDITIONAL_REQUIREMENTS = {
 | 
			
		||||
    "web_client": {
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user