diff --git a/.github/workflows/score_new_plugins.yml b/.github/workflows/score_new_plugins.yml index f8d55d060..f1c89ea65 100644 --- a/.github/workflows/score_new_plugins.yml +++ b/.github/workflows/score_new_plugins.yml @@ -32,10 +32,10 @@ jobs: with: fetch-depth: 0 - - name: Set up Python 3.7 + - name: Set up Python 3.11 uses: actions/setup-python@v4 with: - python-version: 3.7 + python-version: 3.11 - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v1 @@ -131,10 +131,10 @@ jobs: - name: Check out repository code uses: actions/checkout@v4 - - name: Set up Python 3.7 + - name: Set up Python 3.11 uses: actions/setup-python@v4 with: - python-version: 3.7 + python-version: 3.11 - name: Build project run: | diff --git a/.readthedocs.yml b/.readthedocs.yml index 229a16285..ecc53316a 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -3,7 +3,7 @@ version: 2 build: os: "ubuntu-20.04" tools: - python: "3.7" + python: "3.11" python: install: diff --git a/.travis.yml b/.travis.yml index e09c055c8..7f196cde0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ env: - WEB_SUBMISSION="False" before_install: - pip install --upgrade pip -- pip install setuptools==60.5.0 +- pip install setuptools - pip install pytest # download large files - pip install awscli @@ -32,17 +32,17 @@ import: jobs: include: - - name: 3.7 public - python: '3.7' - - name: 3.7 private - python: '3.7' + - name: 3.11 public + python: '3.11' + - name: 3.11 private + python: '3.11' env: - PRIVATE_ACCESS=1 - secure: f1rWEwrslh7qa2g/QlKs001sGC3uaOxZNQSfNOPj+TMCqEo2c6OzImC4hyz+WqCyc6N/lFT4yYo2RhvaqStHMRmu/+9aZmuH05Bb0KQpfzNFA+yGa/U5WR3/4u6KRvDAeNEi9drT2LuacTyGbldmQsquujK0jrPpFWpe7zUUKv0zb0lJf0zcjeSrZlDXLlgD6DCqow7OqHRvW04dPZVy1OArRwtPV6DJ6Rqo1MqFQGHJ806VPlXhSoydb7a58dhGajqPjomdmZjhd3wS6Lv6uetTE/VVb4EP4e7n0qfZIx/TpnWG0SR44pcP7OCNARWYANsAivzxnQ0shyXnIzOo8ZcPYiPpt/5D53i5idTBxXyuDaHGQvgwuY5XLZzznEedBgZa4OvjxAXlLEQjdVDfSsZeYaV9gyFkeTlLnK1zvWi0US38eF2Qtm3Sx3D/5TtBKK2n38tyK5gg/XvJNycaXvIl7iVcnI2ifpqD1mUWI6C9j9Tk19/XEpWkwaFi91+0LZF1GhjBu8o3G5Np4RIOKXi3TIHkpbMM5mf11T6Bm9LvEMq1h8bgRQigEbeJF8CbUOSVFv+AaXsggGjQhuwdyvy2JZo+tO1nfhi+kW3XrDGPsz1R7Wfqduyn7UUh5OiFymeZwKseYKnwU47KyCqDwrq5Mnx1MlSidnVmPriadR4= - secure: WE7FPwy07VzJTKAd2xwZdBhtmh8jk7ojwk4B2rIcBQu0vwUXc1MgO8tBLD7s08lBedBjqZiLZEW31uPMEyWNysouDt16a5gm2d149LR7flI3MOifBtxINfJuC3eOEG65bPgN/bYEsIpLKnu3469d5nxZkK7xsjbWTxHGoUpLvVPsmHY2ZM5/jftybs7fI0do4NMG2XffKfZbiFb447Ao3xeQeEfW6IkJllzgGnlG9FJATFidrbwDNdmzAnvPEnDoKAf7ZvhPV0x9yR5V6P4Ck5hxl8mlPdBa1cRMO8s/1ag1c7YJ3AF9ZlwcwqTiGsT8DHTVRxSz4nFHJTMlrm9j84u7WzLZJBhPgF0UeLN3AQgiAZ3c2TFDvjQWeHVuSPkV5GrKlfhSvR82s9yPEdHQxxwYymBbAr6rJR4NtXTyZX0vg8NRKHssZKLSafs/D/pt9xXspqu8HAHc+mS0lCips79XptSr5BEsioil3D2io3tbzrGugpTeJ7oEA787vKn2Cm4XmhyQ0UBhvwsPZ351l27wZYuNV07o9Ik83hN/w4o2v899QQ/zbX42Iy8ZUCWOPX7MV7+TA7SMxru3qx7HL5hDM8kTetxbLB6Ckr+JOdX8L2Fb5L3TVDpsvfv0ebXgwaQR/ez8/7bcXmBqcERApHDz73HaMXUap+iDR4FLdXE= - AWS_DEFAULT_REGION=us-east-1 - stage: "Automerge check" - python: '3.7' + python: '3.11' install: - travis_wait pip install --no-cache-dir torch - travis_wait pip install --no-cache-dir torchvision diff --git a/README.md b/README.md index 1a6d92574..7d86a9eaf 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ To contribute, please [send in a pull request](https://github.com/brain-score/vi ## Local installation -You will need Python = 3.7 and pip >= 18.1. +You will need Python = 3.11 and pip >= 18.1. `pip install git+https://github.com/brain-score/vision` diff --git a/brainscore_vision/model_helpers/activations/__init__.py b/brainscore_vision/model_helpers/activations/__init__.py index 10f514697..40a84e464 100644 --- a/brainscore_vision/model_helpers/activations/__init__.py +++ b/brainscore_vision/model_helpers/activations/__init__.py @@ -1,3 +1 @@ -from brainscore_vision.model_helpers.activations.keras import KerasWrapper, preprocess as preprocess_keras from brainscore_vision.model_helpers.activations.pytorch import PytorchWrapper, preprocess_images as preprocess_pytorch -from brainscore_vision.model_helpers.activations.tensorflow import TensorflowWrapper, TensorflowSlimWrapper diff --git a/brainscore_vision/model_helpers/activations/core.py b/brainscore_vision/model_helpers/activations/core.py index f37631dbb..ff7c43d6b 100644 --- a/brainscore_vision/model_helpers/activations/core.py +++ b/brainscore_vision/model_helpers/activations/core.py @@ -347,7 +347,7 @@ def translate_images(self, images: List[Union[str, np.ndarray]], image_paths: Li """ Translate images according to selected microsaccades, if microsaccades are required. - :param images: A list of images (in the case of tensorflow models), or a list of arrays (non-tf models). + :param images: A list of arrays. :param image_paths: A list of image paths. Both `image_paths` and `images` are needed since while both tf and non-tf models preprocess images before this point, non-tf models' preprocessed images are fixed as arrays when fed into here. As such, simply returning `image_paths` for @@ -524,7 +524,7 @@ def get_image_with_shape(image: Union[str, np.ndarray]) -> Tuple[np.array, Tuple rows, cols, _ = image.shape # cv2 uses height, width, channels image_is_channels_first = False else: - _, rows, cols, = image.shape # pytorch and keras use channels, height, width + _, rows, cols, = image.shape # pytorch uses channels, height, width image_is_channels_first = True return image, (rows, cols), image_is_channels_first diff --git a/brainscore_vision/model_helpers/activations/keras.py b/brainscore_vision/model_helpers/activations/keras.py deleted file mode 100644 index 8d1acf4d7..000000000 --- a/brainscore_vision/model_helpers/activations/keras.py +++ /dev/null @@ -1,92 +0,0 @@ -from collections import OrderedDict - -import numpy as np - -from brainscore_vision.model_helpers.activations.core import ActivationsExtractorHelper - - -class KerasWrapper: - def __init__(self, model, preprocessing, identifier=None, *args, **kwargs): - """ - :param model: a keras model with a function `preprocess_input` - that will later be called on the loaded numpy image - """ - self._model = model - identifier = identifier or model.name - self._extractor = ActivationsExtractorHelper( - identifier=identifier, get_activations=self.get_activations, preprocessing=preprocessing, - *args, **kwargs) - self._extractor.insert_attrs(self) - - @property - def identifier(self): - return self._extractor.identifier - - @identifier.setter - def identifier(self, value): - self._extractor.identifier = value - - def __call__(self, *args, **kwargs): # cannot assign __call__ as attribute due to Python convention - return self._extractor(*args, **kwargs) - - def get_activations(self, images, layer_names): - from keras import backend as K - input_tensor = self._model.input - layers = [layer for layer in self._model.layers if layer.name in layer_names] - layers = sorted(layers, key=lambda layer: layer_names.index(layer.name)) - if 'logits' in layer_names: - layers.insert(layer_names.index('logits'), self._model.layers[-1]) - assert len(layers) == len(layer_names) - layer_out_tensors = [layer.output for layer in layers] - functor = K.function([input_tensor] + [K.learning_phase()], layer_out_tensors) # evaluate all tensors at once - layer_outputs = functor([images, 0.]) # 0 to signal testing phase - return OrderedDict([(layer_name, layer_output) for layer_name, layer_output in zip(layer_names, layer_outputs)]) - - def __repr__(self): - return repr(self._model) - - def graph(self): - import networkx as nx - g = nx.DiGraph() - for layer in self._model.layers: - g.add_node(layer.name, object=layer, type=type(layer)) - for outbound_node in layer._outbound_nodes: - g.add_edge(layer.name, outbound_node.outbound_layer.name) - return g - - -def load_images(image_filepaths, image_size): - images = [load_image(image_filepath) for image_filepath in image_filepaths] - images = [scale_image(image, image_size) for image in images] - return np.array(images) - - -def load_image(image_filepath): - try: # keras API before tensorflow 2.9.1 - from keras.preprocessing.image import load_img - from keras.preprocessing.image import img_to_array - except ImportError: - from tensorflow.keras.utils import load_img - from tensorflow.keras.utils import img_to_array - img = load_img(image_filepath) - x = img_to_array(img) - return x - - -def scale_image(img, image_size): - from PIL import Image - try: # keras API before tensorflow 2.9.1 - from keras.preprocessing.image import img_to_array - except ImportError: - from tensorflow.keras.utils import img_to_array - img = Image.fromarray(img.astype(np.uint8)) - img = img.resize((image_size, image_size)) - img = img_to_array(img) - return img - - -def preprocess(image_filepaths, image_size, *args, **kwargs): - # only a wrapper to avoid top-level keras imports - from keras.applications.imagenet_utils import preprocess_input - images = load_images(image_filepaths, image_size=image_size) - return preprocess_input(images, *args, **kwargs) diff --git a/brainscore_vision/model_helpers/activations/temporal/inputs/base.py b/brainscore_vision/model_helpers/activations/temporal/inputs/base.py index dea5c86d3..97b6f5088 100644 --- a/brainscore_vision/model_helpers/activations/temporal/inputs/base.py +++ b/brainscore_vision/model_helpers/activations/temporal/inputs/base.py @@ -15,4 +15,3 @@ def is_video_path(path: Union[str, Path]) -> bool: def is_image_path(path: Union[str, Path]) -> bool: extension = path.split('.')[-1] return extension in ['jpg', 'jpeg', 'png', 'bmp', 'tiff'] - \ No newline at end of file diff --git a/brainscore_vision/model_helpers/activations/tensorflow.py b/brainscore_vision/model_helpers/activations/tensorflow.py deleted file mode 100644 index d5e4864d5..000000000 --- a/brainscore_vision/model_helpers/activations/tensorflow.py +++ /dev/null @@ -1,71 +0,0 @@ -from collections import OrderedDict - -from brainscore_vision.model_helpers.activations.core import ActivationsExtractorHelper - - -class TensorflowWrapper: - def __init__(self, identifier, inputs, endpoints: dict, session, *args, **kwargs): - import tensorflow as tf - self._inputs = inputs - self._endpoints = endpoints - self._session = session or tf.compat.v1.Session() - self._extractor = ActivationsExtractorHelper(identifier=identifier, get_activations=self.get_activations, - preprocessing=None, *args, **kwargs) - self._extractor.insert_attrs(self) - - @property - def identifier(self): - return self._extractor.identifier - - @identifier.setter - def identifier(self, value): - self._extractor.identifier = value - - def __call__(self, *args, **kwargs): # cannot assign __call__ as attribute due to Python convention - return self._extractor(*args, **kwargs) - - def get_activations(self, images, layer_names): - layer_tensors = OrderedDict((layer, self._endpoints[ - layer if (layer != 'logits' or layer in self._endpoints) else next(reversed(self._endpoints))]) - for layer in layer_names) - layer_outputs = self._session.run(layer_tensors, feed_dict={self._inputs: images}) - return layer_outputs - - def graph(self): - import networkx as nx - g = nx.DiGraph() - for name, layer in self._endpoints.items(): - g.add_node(name, object=layer, type=type(layer)) - g.add_node("logits", object=self.logits, type=type(self.logits)) - return g - - -class TensorflowSlimWrapper(TensorflowWrapper): - def __init__(self, *args, labels_offset=1, **kwargs): - super(TensorflowSlimWrapper, self).__init__(*args, **kwargs) - self._labels_offset = labels_offset - - def get_activations(self, images, layer_names): - layer_outputs = super(TensorflowSlimWrapper, self).get_activations(images, layer_names) - if 'logits' in layer_outputs: - layer_outputs['logits'] = layer_outputs['logits'][:, self._labels_offset:] - return layer_outputs - - -def load_image(image_filepath): - import tensorflow as tf - image = tf.io.read_file(image_filepath) - image = tf.image.decode_png(image, channels=3) - return image - - -def resize_image(image, image_size): - import tensorflow as tf - image = tf.image.resize(image, (image_size, image_size)) - return image - - -def load_resize_image(image_path, image_size): - image = load_image(image_path) - image = resize_image(image, image_size) - return image diff --git a/brainscore_vision/models/bp_resnet50_julios/setup.py b/brainscore_vision/models/bp_resnet50_julios/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/bp_resnet50_julios/setup.py +++ b/brainscore_vision/models/bp_resnet50_julios/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_0_0/setup.py b/brainscore_vision/models/cornet_s_0_0_0/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/cornet_s_0_0_0/setup.py +++ b/brainscore_vision/models/cornet_s_0_0_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_0_4096/setup.py b/brainscore_vision/models/cornet_s_0_0_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_0_4096/setup.py +++ b/brainscore_vision/models/cornet_s_0_0_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_10_0/setup.py b/brainscore_vision/models/cornet_s_0_10_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_10_0/setup.py +++ b/brainscore_vision/models/cornet_s_0_10_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_10_4096/setup.py b/brainscore_vision/models/cornet_s_0_10_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_10_4096/setup.py +++ b/brainscore_vision/models/cornet_s_0_10_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_11_0/setup.py b/brainscore_vision/models/cornet_s_0_11_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_11_0/setup.py +++ b/brainscore_vision/models/cornet_s_0_11_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_12_0/setup.py b/brainscore_vision/models/cornet_s_0_12_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_12_0/setup.py +++ b/brainscore_vision/models/cornet_s_0_12_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_12_4096/setup.py b/brainscore_vision/models/cornet_s_0_12_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_12_4096/setup.py +++ b/brainscore_vision/models/cornet_s_0_12_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_13_0/setup.py b/brainscore_vision/models/cornet_s_0_13_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_13_0/setup.py +++ b/brainscore_vision/models/cornet_s_0_13_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_14_0/setup.py b/brainscore_vision/models/cornet_s_0_14_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_14_0/setup.py +++ b/brainscore_vision/models/cornet_s_0_14_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_14_4096/setup.py b/brainscore_vision/models/cornet_s_0_14_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_14_4096/setup.py +++ b/brainscore_vision/models/cornet_s_0_14_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_15_0/setup.py b/brainscore_vision/models/cornet_s_0_15_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_15_0/setup.py +++ b/brainscore_vision/models/cornet_s_0_15_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_16_4096/setup.py b/brainscore_vision/models/cornet_s_0_16_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_16_4096/setup.py +++ b/brainscore_vision/models/cornet_s_0_16_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_18_4096/setup.py b/brainscore_vision/models/cornet_s_0_18_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_18_4096/setup.py +++ b/brainscore_vision/models/cornet_s_0_18_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_1_0/setup.py b/brainscore_vision/models/cornet_s_0_1_0/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/cornet_s_0_1_0/setup.py +++ b/brainscore_vision/models/cornet_s_0_1_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_20_4096/setup.py b/brainscore_vision/models/cornet_s_0_20_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_20_4096/setup.py +++ b/brainscore_vision/models/cornet_s_0_20_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_22_4096/setup.py b/brainscore_vision/models/cornet_s_0_22_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_22_4096/setup.py +++ b/brainscore_vision/models/cornet_s_0_22_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_24_4096/setup.py b/brainscore_vision/models/cornet_s_0_24_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_24_4096/setup.py +++ b/brainscore_vision/models/cornet_s_0_24_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_26_4096/setup.py b/brainscore_vision/models/cornet_s_0_26_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_26_4096/setup.py +++ b/brainscore_vision/models/cornet_s_0_26_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_28_4096/setup.py b/brainscore_vision/models/cornet_s_0_28_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_28_4096/setup.py +++ b/brainscore_vision/models/cornet_s_0_28_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_2_0/setup.py b/brainscore_vision/models/cornet_s_0_2_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_2_0/setup.py +++ b/brainscore_vision/models/cornet_s_0_2_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_2_4096/setup.py b/brainscore_vision/models/cornet_s_0_2_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_2_4096/setup.py +++ b/brainscore_vision/models/cornet_s_0_2_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_3_0/setup.py b/brainscore_vision/models/cornet_s_0_3_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_3_0/setup.py +++ b/brainscore_vision/models/cornet_s_0_3_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_4_0/setup.py b/brainscore_vision/models/cornet_s_0_4_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_4_0/setup.py +++ b/brainscore_vision/models/cornet_s_0_4_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_4_4096/setup.py b/brainscore_vision/models/cornet_s_0_4_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_4_4096/setup.py +++ b/brainscore_vision/models/cornet_s_0_4_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_5_0/setup.py b/brainscore_vision/models/cornet_s_0_5_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_5_0/setup.py +++ b/brainscore_vision/models/cornet_s_0_5_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_6_0/setup.py b/brainscore_vision/models/cornet_s_0_6_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_6_0/setup.py +++ b/brainscore_vision/models/cornet_s_0_6_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_6_4096/setup.py b/brainscore_vision/models/cornet_s_0_6_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_6_4096/setup.py +++ b/brainscore_vision/models/cornet_s_0_6_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_7_0/setup.py b/brainscore_vision/models/cornet_s_0_7_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_7_0/setup.py +++ b/brainscore_vision/models/cornet_s_0_7_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_8_0/setup.py b/brainscore_vision/models/cornet_s_0_8_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_8_0/setup.py +++ b/brainscore_vision/models/cornet_s_0_8_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_8_4096/setup.py b/brainscore_vision/models/cornet_s_0_8_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_8_4096/setup.py +++ b/brainscore_vision/models/cornet_s_0_8_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_0_9_0/setup.py b/brainscore_vision/models/cornet_s_0_9_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_0_9_0/setup.py +++ b/brainscore_vision/models/cornet_s_0_9_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_1_0_0/setup.py b/brainscore_vision/models/cornet_s_1_0_0/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/cornet_s_1_0_0/setup.py +++ b/brainscore_vision/models/cornet_s_1_0_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_1_10_0/setup.py b/brainscore_vision/models/cornet_s_1_10_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_1_10_0/setup.py +++ b/brainscore_vision/models/cornet_s_1_10_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_1_10_4096/setup.py b/brainscore_vision/models/cornet_s_1_10_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_1_10_4096/setup.py +++ b/brainscore_vision/models/cornet_s_1_10_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_1_11_0/setup.py b/brainscore_vision/models/cornet_s_1_11_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_1_11_0/setup.py +++ b/brainscore_vision/models/cornet_s_1_11_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_1_12_0/setup.py b/brainscore_vision/models/cornet_s_1_12_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_1_12_0/setup.py +++ b/brainscore_vision/models/cornet_s_1_12_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_1_12_4096/setup.py b/brainscore_vision/models/cornet_s_1_12_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_1_12_4096/setup.py +++ b/brainscore_vision/models/cornet_s_1_12_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_1_13_0/setup.py b/brainscore_vision/models/cornet_s_1_13_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_1_13_0/setup.py +++ b/brainscore_vision/models/cornet_s_1_13_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_1_14_0/setup.py b/brainscore_vision/models/cornet_s_1_14_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_1_14_0/setup.py +++ b/brainscore_vision/models/cornet_s_1_14_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_1_14_4096/setup.py b/brainscore_vision/models/cornet_s_1_14_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_1_14_4096/setup.py +++ b/brainscore_vision/models/cornet_s_1_14_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_1_15_0/setup.py b/brainscore_vision/models/cornet_s_1_15_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_1_15_0/setup.py +++ b/brainscore_vision/models/cornet_s_1_15_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_1_16_4096/setup.py b/brainscore_vision/models/cornet_s_1_16_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_1_16_4096/setup.py +++ b/brainscore_vision/models/cornet_s_1_16_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_1_18_4096/setup.py b/brainscore_vision/models/cornet_s_1_18_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_1_18_4096/setup.py +++ b/brainscore_vision/models/cornet_s_1_18_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_1_1_0/setup.py b/brainscore_vision/models/cornet_s_1_1_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_1_1_0/setup.py +++ b/brainscore_vision/models/cornet_s_1_1_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_1_2_0/setup.py b/brainscore_vision/models/cornet_s_1_2_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_1_2_0/setup.py +++ b/brainscore_vision/models/cornet_s_1_2_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_1_3_0/setup.py b/brainscore_vision/models/cornet_s_1_3_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_1_3_0/setup.py +++ b/brainscore_vision/models/cornet_s_1_3_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_1_4_0/setup.py b/brainscore_vision/models/cornet_s_1_4_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_1_4_0/setup.py +++ b/brainscore_vision/models/cornet_s_1_4_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_1_5_0/setup.py b/brainscore_vision/models/cornet_s_1_5_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_1_5_0/setup.py +++ b/brainscore_vision/models/cornet_s_1_5_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_1_6_0/setup.py b/brainscore_vision/models/cornet_s_1_6_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_1_6_0/setup.py +++ b/brainscore_vision/models/cornet_s_1_6_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_1_7_0/setup.py b/brainscore_vision/models/cornet_s_1_7_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_1_7_0/setup.py +++ b/brainscore_vision/models/cornet_s_1_7_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_1_8_0/setup.py b/brainscore_vision/models/cornet_s_1_8_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_1_8_0/setup.py +++ b/brainscore_vision/models/cornet_s_1_8_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_1_9_0/setup.py b/brainscore_vision/models/cornet_s_1_9_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_1_9_0/setup.py +++ b/brainscore_vision/models/cornet_s_1_9_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_0_0/setup.py b/brainscore_vision/models/cornet_s_2_0_0/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/cornet_s_2_0_0/setup.py +++ b/brainscore_vision/models/cornet_s_2_0_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_0_4096/setup.py b/brainscore_vision/models/cornet_s_2_0_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_2_0_4096/setup.py +++ b/brainscore_vision/models/cornet_s_2_0_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_10_0/setup.py b/brainscore_vision/models/cornet_s_2_10_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_2_10_0/setup.py +++ b/brainscore_vision/models/cornet_s_2_10_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_10_4096/setup.py b/brainscore_vision/models/cornet_s_2_10_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_2_10_4096/setup.py +++ b/brainscore_vision/models/cornet_s_2_10_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_11_0/setup.py b/brainscore_vision/models/cornet_s_2_11_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_2_11_0/setup.py +++ b/brainscore_vision/models/cornet_s_2_11_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_12_0/setup.py b/brainscore_vision/models/cornet_s_2_12_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_2_12_0/setup.py +++ b/brainscore_vision/models/cornet_s_2_12_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_12_4096/setup.py b/brainscore_vision/models/cornet_s_2_12_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_2_12_4096/setup.py +++ b/brainscore_vision/models/cornet_s_2_12_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_13_0/setup.py b/brainscore_vision/models/cornet_s_2_13_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_2_13_0/setup.py +++ b/brainscore_vision/models/cornet_s_2_13_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_14_0/setup.py b/brainscore_vision/models/cornet_s_2_14_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_2_14_0/setup.py +++ b/brainscore_vision/models/cornet_s_2_14_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_14_4096/setup.py b/brainscore_vision/models/cornet_s_2_14_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_2_14_4096/setup.py +++ b/brainscore_vision/models/cornet_s_2_14_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_15_0/setup.py b/brainscore_vision/models/cornet_s_2_15_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_2_15_0/setup.py +++ b/brainscore_vision/models/cornet_s_2_15_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_16_4096/setup.py b/brainscore_vision/models/cornet_s_2_16_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_2_16_4096/setup.py +++ b/brainscore_vision/models/cornet_s_2_16_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_18_4096/setup.py b/brainscore_vision/models/cornet_s_2_18_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_2_18_4096/setup.py +++ b/brainscore_vision/models/cornet_s_2_18_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_1_0/setup.py b/brainscore_vision/models/cornet_s_2_1_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_2_1_0/setup.py +++ b/brainscore_vision/models/cornet_s_2_1_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_2_0/setup.py b/brainscore_vision/models/cornet_s_2_2_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_2_2_0/setup.py +++ b/brainscore_vision/models/cornet_s_2_2_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_2_4096/setup.py b/brainscore_vision/models/cornet_s_2_2_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_2_2_4096/setup.py +++ b/brainscore_vision/models/cornet_s_2_2_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_3_0/setup.py b/brainscore_vision/models/cornet_s_2_3_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_2_3_0/setup.py +++ b/brainscore_vision/models/cornet_s_2_3_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_4_0/setup.py b/brainscore_vision/models/cornet_s_2_4_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_2_4_0/setup.py +++ b/brainscore_vision/models/cornet_s_2_4_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_4_4096/setup.py b/brainscore_vision/models/cornet_s_2_4_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_2_4_4096/setup.py +++ b/brainscore_vision/models/cornet_s_2_4_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_5_0/setup.py b/brainscore_vision/models/cornet_s_2_5_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_2_5_0/setup.py +++ b/brainscore_vision/models/cornet_s_2_5_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_6_0/setup.py b/brainscore_vision/models/cornet_s_2_6_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_2_6_0/setup.py +++ b/brainscore_vision/models/cornet_s_2_6_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_6_4096/setup.py b/brainscore_vision/models/cornet_s_2_6_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_2_6_4096/setup.py +++ b/brainscore_vision/models/cornet_s_2_6_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_7_0/setup.py b/brainscore_vision/models/cornet_s_2_7_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_2_7_0/setup.py +++ b/brainscore_vision/models/cornet_s_2_7_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_8_0/setup.py b/brainscore_vision/models/cornet_s_2_8_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_2_8_0/setup.py +++ b/brainscore_vision/models/cornet_s_2_8_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_8_4096/setup.py b/brainscore_vision/models/cornet_s_2_8_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_2_8_4096/setup.py +++ b/brainscore_vision/models/cornet_s_2_8_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_2_9_0/setup.py b/brainscore_vision/models/cornet_s_2_9_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_2_9_0/setup.py +++ b/brainscore_vision/models/cornet_s_2_9_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_0_0/setup.py b/brainscore_vision/models/cornet_s_3_0_0/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/cornet_s_3_0_0/setup.py +++ b/brainscore_vision/models/cornet_s_3_0_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_0_4096/setup.py b/brainscore_vision/models/cornet_s_3_0_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_0_4096/setup.py +++ b/brainscore_vision/models/cornet_s_3_0_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_10_0/setup.py b/brainscore_vision/models/cornet_s_3_10_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_10_0/setup.py +++ b/brainscore_vision/models/cornet_s_3_10_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_10_4096/setup.py b/brainscore_vision/models/cornet_s_3_10_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_10_4096/setup.py +++ b/brainscore_vision/models/cornet_s_3_10_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_11_0/setup.py b/brainscore_vision/models/cornet_s_3_11_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_11_0/setup.py +++ b/brainscore_vision/models/cornet_s_3_11_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_12_0/setup.py b/brainscore_vision/models/cornet_s_3_12_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_12_0/setup.py +++ b/brainscore_vision/models/cornet_s_3_12_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_12_4096/setup.py b/brainscore_vision/models/cornet_s_3_12_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_12_4096/setup.py +++ b/brainscore_vision/models/cornet_s_3_12_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_13_0/setup.py b/brainscore_vision/models/cornet_s_3_13_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_13_0/setup.py +++ b/brainscore_vision/models/cornet_s_3_13_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_14_0/setup.py b/brainscore_vision/models/cornet_s_3_14_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_14_0/setup.py +++ b/brainscore_vision/models/cornet_s_3_14_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_14_4096/setup.py b/brainscore_vision/models/cornet_s_3_14_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_14_4096/setup.py +++ b/brainscore_vision/models/cornet_s_3_14_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_15_0/setup.py b/brainscore_vision/models/cornet_s_3_15_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_15_0/setup.py +++ b/brainscore_vision/models/cornet_s_3_15_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_16_4096/setup.py b/brainscore_vision/models/cornet_s_3_16_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_16_4096/setup.py +++ b/brainscore_vision/models/cornet_s_3_16_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_18_4096/setup.py b/brainscore_vision/models/cornet_s_3_18_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_18_4096/setup.py +++ b/brainscore_vision/models/cornet_s_3_18_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_1_0/setup.py b/brainscore_vision/models/cornet_s_3_1_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_1_0/setup.py +++ b/brainscore_vision/models/cornet_s_3_1_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_20_4096/setup.py b/brainscore_vision/models/cornet_s_3_20_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_20_4096/setup.py +++ b/brainscore_vision/models/cornet_s_3_20_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_22_4096/setup.py b/brainscore_vision/models/cornet_s_3_22_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_22_4096/setup.py +++ b/brainscore_vision/models/cornet_s_3_22_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_24_4096/setup.py b/brainscore_vision/models/cornet_s_3_24_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_24_4096/setup.py +++ b/brainscore_vision/models/cornet_s_3_24_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_26_4096/setup.py b/brainscore_vision/models/cornet_s_3_26_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_26_4096/setup.py +++ b/brainscore_vision/models/cornet_s_3_26_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_28_4096/setup.py b/brainscore_vision/models/cornet_s_3_28_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_28_4096/setup.py +++ b/brainscore_vision/models/cornet_s_3_28_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_2_0/setup.py b/brainscore_vision/models/cornet_s_3_2_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_2_0/setup.py +++ b/brainscore_vision/models/cornet_s_3_2_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_2_4096/setup.py b/brainscore_vision/models/cornet_s_3_2_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_2_4096/setup.py +++ b/brainscore_vision/models/cornet_s_3_2_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_3_0/setup.py b/brainscore_vision/models/cornet_s_3_3_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_3_0/setup.py +++ b/brainscore_vision/models/cornet_s_3_3_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_4_0/setup.py b/brainscore_vision/models/cornet_s_3_4_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_4_0/setup.py +++ b/brainscore_vision/models/cornet_s_3_4_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_4_4096/setup.py b/brainscore_vision/models/cornet_s_3_4_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_4_4096/setup.py +++ b/brainscore_vision/models/cornet_s_3_4_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_5_0/setup.py b/brainscore_vision/models/cornet_s_3_5_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_5_0/setup.py +++ b/brainscore_vision/models/cornet_s_3_5_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_6_0/setup.py b/brainscore_vision/models/cornet_s_3_6_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_6_0/setup.py +++ b/brainscore_vision/models/cornet_s_3_6_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_6_4096/setup.py b/brainscore_vision/models/cornet_s_3_6_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_6_4096/setup.py +++ b/brainscore_vision/models/cornet_s_3_6_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_7_0/setup.py b/brainscore_vision/models/cornet_s_3_7_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_7_0/setup.py +++ b/brainscore_vision/models/cornet_s_3_7_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_8_0/setup.py b/brainscore_vision/models/cornet_s_3_8_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_8_0/setup.py +++ b/brainscore_vision/models/cornet_s_3_8_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_8_4096/setup.py b/brainscore_vision/models/cornet_s_3_8_4096/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_8_4096/setup.py +++ b/brainscore_vision/models/cornet_s_3_8_4096/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/cornet_s_3_9_0/setup.py b/brainscore_vision/models/cornet_s_3_9_0/setup.py index 68362b48b..dc32bb0fe 100644 --- a/brainscore_vision/models/cornet_s_3_9_0/setup.py +++ b/brainscore_vision/models/cornet_s_3_9_0/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/dbp_resnet50_julios/setup.py b/brainscore_vision/models/dbp_resnet50_julios/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/dbp_resnet50_julios/setup.py +++ b/brainscore_vision/models/dbp_resnet50_julios/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eBarlow_Vanilla/setup.py b/brainscore_vision/models/eBarlow_Vanilla/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eBarlow_Vanilla/setup.py +++ b/brainscore_vision/models/eBarlow_Vanilla/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eBarlow_Vanilla_1/setup.py b/brainscore_vision/models/eBarlow_Vanilla_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eBarlow_Vanilla_1/setup.py +++ b/brainscore_vision/models/eBarlow_Vanilla_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eBarlow_Vanilla_2/setup.py b/brainscore_vision/models/eBarlow_Vanilla_2/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eBarlow_Vanilla_2/setup.py +++ b/brainscore_vision/models/eBarlow_Vanilla_2/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eBarlow_augself_linear_1/setup.py b/brainscore_vision/models/eBarlow_augself_linear_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eBarlow_augself_linear_1/setup.py +++ b/brainscore_vision/models/eBarlow_augself_linear_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eBarlow_augself_mlp_1/setup.py b/brainscore_vision/models/eBarlow_augself_mlp_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eBarlow_augself_mlp_1/setup.py +++ b/brainscore_vision/models/eBarlow_augself_mlp_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eBarlow_lmda_0001_1/setup.py b/brainscore_vision/models/eBarlow_lmda_0001_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eBarlow_lmda_0001_1/setup.py +++ b/brainscore_vision/models/eBarlow_lmda_0001_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eBarlow_lmda_001_1/setup.py b/brainscore_vision/models/eBarlow_lmda_001_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eBarlow_lmda_001_1/setup.py +++ b/brainscore_vision/models/eBarlow_lmda_001_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eBarlow_lmda_001_2/setup.py b/brainscore_vision/models/eBarlow_lmda_001_2/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eBarlow_lmda_001_2/setup.py +++ b/brainscore_vision/models/eBarlow_lmda_001_2/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eBarlow_lmda_001_3/setup.py b/brainscore_vision/models/eBarlow_lmda_001_3/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eBarlow_lmda_001_3/setup.py +++ b/brainscore_vision/models/eBarlow_lmda_001_3/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eBarlow_lmda_01/setup.py b/brainscore_vision/models/eBarlow_lmda_01/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eBarlow_lmda_01/setup.py +++ b/brainscore_vision/models/eBarlow_lmda_01/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eBarlow_lmda_01_1/setup.py b/brainscore_vision/models/eBarlow_lmda_01_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eBarlow_lmda_01_1/setup.py +++ b/brainscore_vision/models/eBarlow_lmda_01_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eBarlow_lmda_01_2/setup.py b/brainscore_vision/models/eBarlow_lmda_01_2/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eBarlow_lmda_01_2/setup.py +++ b/brainscore_vision/models/eBarlow_lmda_01_2/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eBarlow_lmda_02_1/setup.py b/brainscore_vision/models/eBarlow_lmda_02_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eBarlow_lmda_02_1/setup.py +++ b/brainscore_vision/models/eBarlow_lmda_02_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eBarlow_lmda_03_1/setup.py b/brainscore_vision/models/eBarlow_lmda_03_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eBarlow_lmda_03_1/setup.py +++ b/brainscore_vision/models/eBarlow_lmda_03_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eBarlow_lmda_04_1/setup.py b/brainscore_vision/models/eBarlow_lmda_04_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eBarlow_lmda_04_1/setup.py +++ b/brainscore_vision/models/eBarlow_lmda_04_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eBarlow_lmda_05_1/setup.py b/brainscore_vision/models/eBarlow_lmda_05_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eBarlow_lmda_05_1/setup.py +++ b/brainscore_vision/models/eBarlow_lmda_05_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eMMCR_Mom_Vanilla_1/setup.py b/brainscore_vision/models/eMMCR_Mom_Vanilla_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eMMCR_Mom_Vanilla_1/setup.py +++ b/brainscore_vision/models/eMMCR_Mom_Vanilla_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eMMCR_Mom_Vanilla_2/setup.py b/brainscore_vision/models/eMMCR_Mom_Vanilla_2/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eMMCR_Mom_Vanilla_2/setup.py +++ b/brainscore_vision/models/eMMCR_Mom_Vanilla_2/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eMMCR_Mom_lmda_0001_1/setup.py b/brainscore_vision/models/eMMCR_Mom_lmda_0001_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eMMCR_Mom_lmda_0001_1/setup.py +++ b/brainscore_vision/models/eMMCR_Mom_lmda_0001_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eMMCR_Mom_lmda_001_1/setup.py b/brainscore_vision/models/eMMCR_Mom_lmda_001_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eMMCR_Mom_lmda_001_1/setup.py +++ b/brainscore_vision/models/eMMCR_Mom_lmda_001_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eMMCR_Mom_lmda_01_1/setup.py b/brainscore_vision/models/eMMCR_Mom_lmda_01_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eMMCR_Mom_lmda_01_1/setup.py +++ b/brainscore_vision/models/eMMCR_Mom_lmda_01_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eMMCR_Mom_lmda_01_2/setup.py b/brainscore_vision/models/eMMCR_Mom_lmda_01_2/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eMMCR_Mom_lmda_01_2/setup.py +++ b/brainscore_vision/models/eMMCR_Mom_lmda_01_2/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eMMCR_Mom_lmda_02_1/setup.py b/brainscore_vision/models/eMMCR_Mom_lmda_02_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eMMCR_Mom_lmda_02_1/setup.py +++ b/brainscore_vision/models/eMMCR_Mom_lmda_02_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eMMCR_Mom_lmda_03_1/setup.py b/brainscore_vision/models/eMMCR_Mom_lmda_03_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eMMCR_Mom_lmda_03_1/setup.py +++ b/brainscore_vision/models/eMMCR_Mom_lmda_03_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eMMCR_Mom_lmda_04_1/setup.py b/brainscore_vision/models/eMMCR_Mom_lmda_04_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eMMCR_Mom_lmda_04_1/setup.py +++ b/brainscore_vision/models/eMMCR_Mom_lmda_04_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eMMCR_Mom_lmda_05_1/setup.py b/brainscore_vision/models/eMMCR_Mom_lmda_05_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eMMCR_Mom_lmda_05_1/setup.py +++ b/brainscore_vision/models/eMMCR_Mom_lmda_05_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eMMCR_Vanilla/setup.py b/brainscore_vision/models/eMMCR_Vanilla/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eMMCR_Vanilla/setup.py +++ b/brainscore_vision/models/eMMCR_Vanilla/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eMMCR_VanillaV2/setup.py b/brainscore_vision/models/eMMCR_VanillaV2/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eMMCR_VanillaV2/setup.py +++ b/brainscore_vision/models/eMMCR_VanillaV2/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eMMCR_Vanilla_1/setup.py b/brainscore_vision/models/eMMCR_Vanilla_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eMMCR_Vanilla_1/setup.py +++ b/brainscore_vision/models/eMMCR_Vanilla_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eMMCR_Vanilla_2/setup.py b/brainscore_vision/models/eMMCR_Vanilla_2/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eMMCR_Vanilla_2/setup.py +++ b/brainscore_vision/models/eMMCR_Vanilla_2/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eMMCR_lmda_01/setup.py b/brainscore_vision/models/eMMCR_lmda_01/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eMMCR_lmda_01/setup.py +++ b/brainscore_vision/models/eMMCR_lmda_01/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eMMCR_lmda_01V2/setup.py b/brainscore_vision/models/eMMCR_lmda_01V2/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eMMCR_lmda_01V2/setup.py +++ b/brainscore_vision/models/eMMCR_lmda_01V2/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eMMCR_lmda_01_1/setup.py b/brainscore_vision/models/eMMCR_lmda_01_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eMMCR_lmda_01_1/setup.py +++ b/brainscore_vision/models/eMMCR_lmda_01_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eMMCR_lmda_01_2/setup.py b/brainscore_vision/models/eMMCR_lmda_01_2/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eMMCR_lmda_01_2/setup.py +++ b/brainscore_vision/models/eMMCR_lmda_01_2/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eMMCR_lmda_01_3/setup.py b/brainscore_vision/models/eMMCR_lmda_01_3/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eMMCR_lmda_01_3/setup.py +++ b/brainscore_vision/models/eMMCR_lmda_01_3/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eSimCLR_Vanilla_1/setup.py b/brainscore_vision/models/eSimCLR_Vanilla_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eSimCLR_Vanilla_1/setup.py +++ b/brainscore_vision/models/eSimCLR_Vanilla_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eSimCLR_Vanilla_2/setup.py b/brainscore_vision/models/eSimCLR_Vanilla_2/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eSimCLR_Vanilla_2/setup.py +++ b/brainscore_vision/models/eSimCLR_Vanilla_2/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eSimCLR_lmda_0001_1/setup.py b/brainscore_vision/models/eSimCLR_lmda_0001_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eSimCLR_lmda_0001_1/setup.py +++ b/brainscore_vision/models/eSimCLR_lmda_0001_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eSimCLR_lmda_001_1/setup.py b/brainscore_vision/models/eSimCLR_lmda_001_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eSimCLR_lmda_001_1/setup.py +++ b/brainscore_vision/models/eSimCLR_lmda_001_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eSimCLR_lmda_01_1/setup.py b/brainscore_vision/models/eSimCLR_lmda_01_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eSimCLR_lmda_01_1/setup.py +++ b/brainscore_vision/models/eSimCLR_lmda_01_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eSimCLR_lmda_01_2/setup.py b/brainscore_vision/models/eSimCLR_lmda_01_2/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eSimCLR_lmda_01_2/setup.py +++ b/brainscore_vision/models/eSimCLR_lmda_01_2/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eSimCLR_lmda_02_1/setup.py b/brainscore_vision/models/eSimCLR_lmda_02_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eSimCLR_lmda_02_1/setup.py +++ b/brainscore_vision/models/eSimCLR_lmda_02_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eSimCLR_lmda_02_1_1/setup.py b/brainscore_vision/models/eSimCLR_lmda_02_1_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eSimCLR_lmda_02_1_1/setup.py +++ b/brainscore_vision/models/eSimCLR_lmda_02_1_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eSimCLR_lmda_03_1/setup.py b/brainscore_vision/models/eSimCLR_lmda_03_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eSimCLR_lmda_03_1/setup.py +++ b/brainscore_vision/models/eSimCLR_lmda_03_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eSimCLR_lmda_04_1/setup.py b/brainscore_vision/models/eSimCLR_lmda_04_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eSimCLR_lmda_04_1/setup.py +++ b/brainscore_vision/models/eSimCLR_lmda_04_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eSimCLR_lmda_04_1_1/setup.py b/brainscore_vision/models/eSimCLR_lmda_04_1_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eSimCLR_lmda_04_1_1/setup.py +++ b/brainscore_vision/models/eSimCLR_lmda_04_1_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/eSimCLR_lmda_05_1/setup.py b/brainscore_vision/models/eSimCLR_lmda_05_1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/eSimCLR_lmda_05_1/setup.py +++ b/brainscore_vision/models/eSimCLR_lmda_05_1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/r50_tvpt/setup.py b/brainscore_vision/models/r50_tvpt/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/r50_tvpt/setup.py +++ b/brainscore_vision/models/r50_tvpt/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/resnet50_eMMCR_Vanilla/setup.py b/brainscore_vision/models/resnet50_eMMCR_Vanilla/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/resnet50_eMMCR_Vanilla/setup.py +++ b/brainscore_vision/models/resnet50_eMMCR_Vanilla/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/resnet50_eMMCR_VanillaV2/setup.py b/brainscore_vision/models/resnet50_eMMCR_VanillaV2/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/resnet50_eMMCR_VanillaV2/setup.py +++ b/brainscore_vision/models/resnet50_eMMCR_VanillaV2/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/resnet50_eMMCR_eqp10_lm1/setup.py b/brainscore_vision/models/resnet50_eMMCR_eqp10_lm1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/resnet50_eMMCR_eqp10_lm1/setup.py +++ b/brainscore_vision/models/resnet50_eMMCR_eqp10_lm1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/resnet50_julios/setup.py b/brainscore_vision/models/resnet50_julios/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/resnet50_julios/setup.py +++ b/brainscore_vision/models/resnet50_julios/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/tv_efficientnet-b1/setup.py b/brainscore_vision/models/tv_efficientnet-b1/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/tv_efficientnet-b1/setup.py +++ b/brainscore_vision/models/tv_efficientnet-b1/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/yudixie_resnet50_imagenet1kpret_0_240222/setup.py b/brainscore_vision/models/yudixie_resnet50_imagenet1kpret_0_240222/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/yudixie_resnet50_imagenet1kpret_0_240222/setup.py +++ b/brainscore_vision/models/yudixie_resnet50_imagenet1kpret_0_240222/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/brainscore_vision/models/yudixie_resnet50_imagenet1kpret_0_240312/setup.py b/brainscore_vision/models/yudixie_resnet50_imagenet1kpret_0_240312/setup.py index 421914cfb..1f4885e1f 100644 --- a/brainscore_vision/models/yudixie_resnet50_imagenet1kpret_0_240312/setup.py +++ b/brainscore_vision/models/yudixie_resnet50_imagenet1kpret_0_240312/setup.py @@ -19,7 +19,7 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', ], test_suite='tests', ) diff --git a/pyproject.toml b/pyproject.toml index b81e705a5..f3fefd05b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,10 +9,10 @@ description = "The Brain-Score library enables model comparisons to behavioral a authors = [] license = { 'file' = 'LICENSE' } readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.11" dependencies = [ - "numpy>=1.17", + "numpy", "brainscore_core @ git+https://github.com/brain-score/core", "result_caching @ git+https://github.com/brain-score/result_caching", "importlib-metadata<5", # workaround to https://github.com/brain-score/brainio/issues/28 @@ -39,12 +39,9 @@ test = [ "pytest-mock", "torch", "torchvision", - "tensorflow==2.14", - "keras==2.14", - "protobuf==3.20.3", # https://protobuf.dev/news/2022-05-06/#python-updates + "protobuf", # https://protobuf.dev/news/2022-05-06/#python-updates "matplotlib", # for examples "pytest-mock", - "tf_slim", ] [build-system] diff --git a/tests/test_model_helpers/activations/test___init__.py b/tests/test_model_helpers/activations/test___init__.py index 2928f8fa6..3f3cada54 100644 --- a/tests/test_model_helpers/activations/test___init__.py +++ b/tests/test_model_helpers/activations/test___init__.py @@ -6,7 +6,7 @@ from pathlib import Path from brainio.stimuli import StimulusSet -from brainscore_vision.model_helpers.activations import KerasWrapper, PytorchWrapper, TensorflowSlimWrapper +from brainscore_vision.model_helpers.activations import PytorchWrapper from brainscore_vision.model_helpers.activations.core import flatten from brainscore_vision.model_helpers.activations.pca import LayerPCA @@ -93,74 +93,10 @@ def forward(self, x): return PytorchWrapper(model=MyTransformer(), preprocessing=preprocessing) -def keras_vgg19(): - import keras - from keras.applications.vgg19 import VGG19, preprocess_input - from brainscore_vision.model_helpers.activations.keras import load_images - keras.backend.clear_session() - preprocessing = lambda image_filepaths: preprocess_input(load_images(image_filepaths, image_size=224)) - return KerasWrapper(model=VGG19(), preprocessing=preprocessing) - - -def tfslim_custom(): - from brainscore_vision.model_helpers.activations.tensorflow import load_resize_image - import tensorflow as tf - import tf_slim as slim - tf.compat.v1.reset_default_graph() - - image_size = 224 - placeholder = tf.compat.v1.placeholder(dtype=tf.string, shape=[64]) - preprocess = lambda image_path: load_resize_image(image_path, image_size) - preprocess = tf.map_fn(preprocess, placeholder, dtype=tf.float32) - - with tf.compat.v1.variable_scope('my_model', values=[preprocess]) as sc: - end_points_collection = sc.original_name_scope + '_end_points' - # Collect outputs for conv2d, fully_connected and max_pool2d. - with slim.arg_scope([slim.conv2d, slim.fully_connected, slim.max_pool2d], - outputs_collections=[end_points_collection]): - net = slim.conv2d(preprocess, 64, [11, 11], 4, padding='VALID', scope='conv1') - net = slim.max_pool2d(net, [5, 5], 5, scope='pool1') - net = slim.max_pool2d(net, [3, 3], 2, scope='pool2') - net = slim.flatten(net, scope='flatten') - net = slim.fully_connected(net, 1000, scope='logits') - endpoints = slim.utils.convert_collection_to_dict(end_points_collection) - - session = tf.compat.v1.Session() - session.run(tf.compat.v1.initialize_all_variables()) - return TensorflowSlimWrapper(identifier='tf-custom', labels_offset=0, - endpoints=endpoints, inputs=placeholder, session=session) - - -def tfslim_vgg16(): - import tensorflow as tf - from nets import nets_factory - from preprocessing import vgg_preprocessing - from brainscore_vision.model_helpers.activations.tensorflow import load_resize_image - tf.compat.v1.reset_default_graph() - - image_size = 224 - placeholder = tf.compat.v1.placeholder(dtype=tf.string, shape=[64]) - preprocess_image = lambda image: vgg_preprocessing.preprocess_image( - image, image_size, image_size, resize_side_min=image_size) - preprocess = lambda image_path: preprocess_image(load_resize_image(image_path, image_size)) - preprocess = tf.map_fn(preprocess, placeholder, dtype=tf.float32) - - model_ctr = nets_factory.get_network_fn('vgg_16', num_classes=1001, is_training=False) - logits, endpoints = model_ctr(preprocess) - - session = tf.compat.v1.Session() - session.run(tf.compat.v1.initialize_all_variables()) - return TensorflowSlimWrapper(identifier='tf-vgg16', labels_offset=1, - endpoints=endpoints, inputs=placeholder, session=session) - - models_layers = [ pytest.param(pytorch_custom, ['linear', 'relu2']), pytest.param(pytorch_alexnet, ['features.12', 'classifier.5'], marks=pytest.mark.memory_intense), pytest.param(pytorch_transformer_substitute, ['relu1']), - pytest.param(keras_vgg19, ['block3_pool'], marks=pytest.mark.memory_intense), - pytest.param(tfslim_custom, ['my_model/pool2'], marks=pytest.mark.memory_intense), - pytest.param(tfslim_vgg16, ['vgg_16/pool5'], marks=pytest.mark.memory_intense), ] # exact microsaccades for pytorch_alexnet, grayscale.png, for 1 and 10 number_of_trials @@ -347,8 +283,6 @@ def test_exact_microsaccades(number_of_trials): @pytest.mark.memory_intense @pytest.mark.parametrize(["model_ctr", "internal_layers"], [ (pytorch_alexnet, ['features.12', 'classifier.5']), - (keras_vgg19, ['block3_pool']), - (tfslim_vgg16, ['vgg_16/pool5']), ]) def test_mixed_layer_logits(model_ctr, internal_layers): stimuli_paths = [os.path.join(os.path.dirname(__file__), 'rgb.jpg')] @@ -365,7 +299,6 @@ def test_mixed_layer_logits(model_ctr, internal_layers): @pytest.mark.parametrize(["model_ctr", "expected_identifier"], [ (pytorch_custom, 'MyModel'), (pytorch_alexnet, 'AlexNet'), - (keras_vgg19, 'vgg19'), ]) def test_infer_identifier(model_ctr, expected_identifier): model = model_ctr()