Amber Brown
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							c26f49a664
							
						
					 | 
					
						
						
							
							Make the dependencies more like a standard Python project and hook up the optional dependencies to setuptools (#4298)
						
						
						
						
						
						
					 | 
					
						2018-12-22 01:37:26 +11:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
					 | 
					
						
						
						
						
							
						
						
							058934b1cf
							
						
					 | 
					
						
						
							
							uh, Matrix is called Matrix these days...
						
						
						
						
						
						
					 | 
					
						2018-10-21 12:18:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
					 | 
					
						
						
						
						
							
						
						
							e721a7f2c1
							
						
					 | 
					
						
						
							
							Implement a null 'test' command
						
						
						
						
						
						
					 | 
					
						2016-12-09 18:00:58 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
					 | 
					
						
						
						
						
							
						
						
							af32d3b773
							
						
					 | 
					
						
						
							
							Don't try to run tox from setup.py
						
						
						
						
						
						
						
						Using tox to run the tests is a bad idea, as per the comments. 
						
						
					 | 
					
						2016-12-09 17:16:31 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
					 | 
					
						
						
						
						
							
						
						
							6c28ac260c
							
						
					 | 
					
						
						
							
							copyrights
						
						
						
						
						
						
					 | 
					
						2016-01-07 04:26:29 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							73e4ad4b8b
							
						
					 | 
					
						
						
							
							Merge branch 'master' into develop
						
						
						
						
						
						
						
						Conflicts:
	setup.py 
						
						
					 | 
					
						2015-09-07 15:06:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							227b77409f
							
						
					 | 
					
						
						
							
							DEPENDENCY_LINKS was turned to a list
						
						
						
						
						
						
					 | 
					
						2015-09-04 08:56:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							06094591c5
							
						
					 | 
					
						
						
							
							Pass an empty list of arguments to tox if no arguments are given
						
						
						
						
						
						
					 | 
					
						2015-08-26 13:13:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							fd246fde89
							
						
					 | 
					
						
						
							
							Install tox locally if it wasn't already installed when running setup.py test
						
						
						
						
						
						
					 | 
					
						2015-08-26 12:59:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							4f6fa981ec
							
						
					 | 
					
						
						
							
							Make 'setup.py test' run tox
						
						
						
						
						
						
					 | 
					
						2015-08-26 12:45:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							2e31dd2ad3
							
						
					 | 
					
						
						
							
							Add tox.ini file for synapse
						
						
						
						
						
						
					 | 
					
						2015-08-25 14:14:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							21ac8be5f7
							
						
					 | 
					
						
						
							
							Depend on Twisted>=15.1 rather than pining to a particular version
						
						
						
						
						
						
					 | 
					
						2015-08-12 17:25:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							66da8f60d0
							
						
					 | 
					
						
						
							
							Bump the version of twisted needed for setup_requires to 15.2.1
						
						
						
						
						
						
					 | 
					
						2015-06-15 16:27:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							119e5d7702
							
						
					 | 
					
						
						
							
							Seperate scripts/ into scripts/ and scripts-dev/, where scripts/* are automatically added to the package
						
						
						
						
						
						
					 | 
					
						2015-05-06 11:41:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Baker
							
						 
					 | 
					
						
						
						
						
							
						
						
							64cf1483e5
							
						
					 | 
					
						
						
							
							D'oh - setup.py used the dict directly: make it use the wrapper function.
						
						
						
						
						
						
					 | 
					
						2015-03-19 11:21:34 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							7393c5ce4c
							
						
					 | 
					
						
						
							
							Rename register script to 'register_new_matrix_user'
						
						
						
						
						
						
					 | 
					
						2015-03-13 15:33:21 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							bcfce93ccd
							
						
					 | 
					
						
						
							
							Add 'register_new_user' script
						
						
						
						
						
						
					 | 
					
						2015-03-13 15:25:30 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							eab141ee67
							
						
					 | 
					
						
						
							
							Rename path to path_segments to make it clearer that it is a list
						
						
						
						
						
						
					 | 
					
						2015-02-10 18:25:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							a9684730ac
							
						
					 | 
					
						
						
							
							Add the 'setup_requires' and allow easy_install since jenkins uses them
						
						
						
						
						
						
					 | 
					
						2015-02-10 17:48:16 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							7ed971d9b2
							
						
					 | 
					
						
						
							
							Single source version and python dependencies, prevent people accidentally installing with easy_install, use scripts rather than entry_points to install synctl
						
						
						
						
						
						
					 | 
					
						2015-02-10 17:42:36 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							22c1ffb0a0
							
						
					 | 
					
						
						
							
							Add a media/v1/identicon resource for generating identicons using pydenticon
						
						
						
						
						
						
					 | 
					
						2015-02-02 16:02:31 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							6e856d7729
							
						
					 | 
					
						
						
							
							Merge master into develop
						
						
						
						
						
						
						
						Conflicts:
	README.rst
	setup.py 
						
						
					 | 
					
						2015-02-02 14:05:42 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							d3dd749044
							
						
					 | 
					
						
						
							
							Pin the version of Twisted to 14.0.2 since we are using some of its internals
						
						
						
						
						
						
					 | 
					
						2015-02-02 13:17:45 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							83c31735d0
							
						
					 | 
					
						
						
							
							Use >= for version of webclient
						
						
						
						
						
						
					 | 
					
						2015-02-02 13:07:43 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							c934760014
							
						
					 | 
					
						
						
							
							Bump version of webclient pulled in.
						
						
						
						
						
						
					 | 
					
						2015-02-02 13:03:03 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Baker
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ccfdfcd7c
							
						
					 | 
					
						
						
							
							Add twisted to setup requires so it gets processed before setuptools_trial
						
						
						
						
						
						
					 | 
					
						2015-01-30 17:15:39 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							88391bcdc3
							
						
					 | 
					
						
						
							
							Allow any greater version for webclient
						
						
						
						
						
						
					 | 
					
						2015-01-30 16:09:38 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Baker
							
						 
					 | 
					
						
						
						
						
							
						
						
							bd03947c05
							
						
					 | 
					
						
						
							
							We do need Twisted 14, not 15: we use internal Twisted things that have been removed in 15.
						
						
						
						
						
						
					 | 
					
						2015-01-30 11:13:42 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e4a56c3a9
							
						
					 | 
					
						
						
							
							Bump web sdk version to 0.6.0
						
						
						
						
						
						
					 | 
					
						2014-12-19 13:39:24 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							cde840a82c
							
						
					 | 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
						
						
						
						
						
						
						
						Conflicts:
	setup.py 
						
						
					 | 
					
						2014-12-11 17:48:48 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							61fc37e467
							
						
					 | 
					
						
						
							
							Merge branch 'develop' into media_repository
						
						
						
						
						
						
					 | 
					
						2014-12-10 16:14:17 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							d45c030652
							
						
					 | 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
						
						
						
						
						
						
					 | 
					
						2014-12-09 14:53:30 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							63b0b946be
							
						
					 | 
					
						
						
							
							point the entry_point for synapse-homeserver at the right method
						
						
						
						
						
						
					 | 
					
						2014-12-05 18:01:05 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							05e48c5d4b
							
						
					 | 
					
						
						
							
							Add pillow to dependencies
						
						
						
						
						
						
					 | 
					
						2014-12-05 16:29:36 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							ce212eb83a
							
						
					 | 
					
						
						
							
							Pull in latest matrix-angular_sdk
						
						
						
						
						
						
					 | 
					
						2014-12-05 11:55:24 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							1c72e22c4f
							
						
					 | 
					
						
						
							
							Pull in latest matrix-angular_sdk
						
						
						
						
						
						
					 | 
					
						2014-12-05 11:21:56 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							c1e66800a9
							
						
					 | 
					
						
						
							
							Begin fleshing out a new Event object
						
						
						
						
						
						
					 | 
					
						2014-12-02 11:40:22 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							7cb21a24d4
							
						
					 | 
					
						
						
							
							Bump pinned version of pynacl pulled from github
						
						
						
						
						
						
					 | 
					
						2014-11-27 17:29:29 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							ad13f14432
							
						
					 | 
					
						
						
							
							Bump version numbers and change log
						
						
						
						
						
						
					 | 
					
						2014-11-26 11:53:12 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							f3ee8d6322
							
						
					 | 
					
						
						
							
							Use tagged version of matrix-angular-sdk
						
						
						
						
						
						
					 | 
					
						2014-11-20 10:51:04 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							1b91c26409
							
						
					 | 
					
						
						
							
							Mark synapse as not zip-safe since it needs to be able to read schema files from the filesystem
						
						
						
						
						
						
					 | 
					
						2014-11-17 16:36:24 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							5d273a0c76
							
						
					 | 
					
						
						
							
							Remove syweb directory. pull in syweb as a dependency from github
						
						
						
						
						
						
					 | 
					
						2014-11-17 12:55:24 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							e7c6d2c9d9
							
						
					 | 
					
						
						
							
							SYN-138: Rewrite synctl in python and include it in the python distribution
						
						
						
						
						
						
					 | 
					
						2014-11-13 14:39:30 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							3068210a93
							
						
					 | 
					
						
						
							
							SYN-112: Get pynacl from github instead of PyPI
						
						
						
						
						
						
					 | 
					
						2014-11-04 16:45:33 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							4a73c366fa
							
						
					 | 
					
						
						
							
							exclude tests
						
						
						
						
						
						
					 | 
					
						2014-11-04 15:18:43 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							15be181642
							
						
					 | 
					
						
						
							
							Add log message if we can't enable ECC. Require pyopenssl>=0.14 since 0.13 doesn't seem to have ECC
						
						
						
						
						
						
					 | 
					
						2014-10-24 19:27:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							06a5a40e90
							
						
					 | 
					
						
						
							
							use a tagged version of syutil rather than master
						
						
						
						
						
						
					 | 
					
						2014-10-20 15:11:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0382357ca
							
						
					 | 
					
						
						
							
							Use https link to download syutil as not everyone has ssh access to github.
						
						
						
						
						
						
					 | 
					
						2014-10-20 14:43:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							5356044b77
							
						
					 | 
					
						
						
							
							Bump syutil dependency
						
						
						
						
						
						
					 | 
					
						2014-10-17 20:35:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
					 | 
					
						
						
						
						
							
						
						
							8a7c1d6a00
							
						
					 | 
					
						
						
							
							fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.
						
						
						
						
						
						
					 | 
					
						2014-09-03 17:31:57 +01:00 | 
					
					
						
						
							
							
							
						
					 |