mirror of
				https://github.com/matrix-org/synapse.git
				synced 2025-10-31 20:28:16 +00:00 
			
		
		
		
	Fix track_memory_usage on poetry-core 1.3.x installations (#14221)
				
					
				
			* Fix `track_memory_usage` on poetry-core 1.3.x installations The same kind of problem as discussed in #14085: 1. we defined an extra with an underscore 2. we look it up at runtime with an underscore 3. but poetry-core 1.3.x. installs it with a dash, causing (2) to fail. Fix by using a dash everywhere. * Changelog
This commit is contained in:
		
							parent
							
								
									a8677bc9b8
								
							
						
					
					
						commit
						8e50299d8b
					
				
							
								
								
									
										1
									
								
								changelog.d/14221.misc
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								changelog.d/14221.misc
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1 @@ | ||||
| Rename the `cache_memory` extra to `cache-memory`, for compatability with poetry-core 1.3.0 and [PEP 685](https://peps.python.org/pep-0685/). From-source installations using this extra will need to install using the new name. | ||||
| @ -227,7 +227,7 @@ jwt = ["authlib"] | ||||
| # (if it is not installed, we fall back to slow code.) | ||||
| redis = ["txredisapi", "hiredis"] | ||||
| # Required to use experimental `caches.track_memory_usage` config option. | ||||
| cache_memory = ["pympler"] | ||||
| cache-memory = ["pympler"] | ||||
| test = ["parameterized", "idna"] | ||||
| 
 | ||||
| # The duplication here is awful. I hate hate hate hate hate it. However, for now I want | ||||
| @ -258,7 +258,7 @@ all = [ | ||||
|     "jaeger-client", "opentracing", | ||||
|     # redis | ||||
|     "txredisapi", "hiredis", | ||||
|     # cache_memory | ||||
|     # cache-memory | ||||
|     "pympler", | ||||
|     # omitted: | ||||
|     #   - test: it's useful to have this separate from dev deps in the olddeps job | ||||
|  | ||||
| @ -159,7 +159,7 @@ class CacheConfig(Config): | ||||
| 
 | ||||
|         self.track_memory_usage = cache_config.get("track_memory_usage", False) | ||||
|         if self.track_memory_usage: | ||||
|             check_requirements("cache_memory") | ||||
|             check_requirements("cache-memory") | ||||
| 
 | ||||
|         expire_caches = cache_config.get("expire_caches", True) | ||||
|         cache_entry_ttl = cache_config.get("cache_entry_ttl", "30m") | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user