Merge branch 'master' into fix-serializer-index-errors

Author: joereg4

Makefile

@@ -4,47 +4,51 @@ docker_config = --settings=config.docker-compose
 gql_compose_config = -f docker-compose.yml -f Resources/compose/docker-compose-prod-graphql.yml
 gqlv1beta_compose_config = -f docker-compose.yml -f Resources/compose/docker-compose-prod-graphql.yml -f Resources/compose/docker-compose-prod-graphql-v1beta.yml
 
+# Auto-detect Python and pip commands
+PYTHON := $(shell which python3 2>/dev/null || which python 2>/dev/null || echo python3)
+PIP := $(shell which pip3 2>/dev/null || which pip 2>/dev/null || echo pip3)
+
 .PHONY: help
 .SILENT:
 
 help:
 	@grep -E '^[a-zA-Z_-]+:.*?# .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?# "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
 install:  # Install base requirements to run project
-	pip install -r requirements.txt
+	$(PIP) install -r requirements.txt
 
 dev-install:  # Install developer requirements + base requirements
-	pip install -r test-requirements.txt
+	$(PIP) install -r test-requirements.txt
 
 setup:  # Set up the project database
-	python manage.py migrate ${local_config}
+	$(PYTHON) manage.py migrate ${local_config}
 
 build-db:  # Build database
-	echo "from data.v2.build import build_all; build_all()" | python manage.py shell ${local_config}
+	echo "from data.v2.build import build_all; build_all()" | $(PYTHON) manage.py shell ${local_config}
 
 wipe-sqlite-db:  # Delete's the project database
 	rm -rf db.sqlite3
 
 serve:  # Run the project locally
-	python manage.py runserver ${local_config}
+	$(PYTHON) manage.py runserver ${local_config}
 
 test:  # Run tests
-	python manage.py test ${local_config}
+	$(PYTHON) manage.py test ${local_config}
 
 clean:  # Remove any pyc files
 	find . -type f -name '*.pyc' -delete
 
 migrate:  # Run any outstanding migrations
-	python manage.py migrate ${local_config}
+	$(PYTHON) manage.py migrate ${local_config}
 
 make-migrations:  # Create migrations files if schema has changed
-	python manage.py makemigrations ${local_config}
+	$(PYTHON) manage.py makemigrations ${local_config}
 
 shell:  # Load a shell
-	python manage.py shell ${local_config}
+	$(PYTHON) manage.py shell ${local_config}
 
 openapi-generate:
-	python manage.py spectacular --color --file openapi.yml ${local_config}
+	$(PYTHON) manage.py spectacular --color --file openapi.yml ${local_config}
 
 docker-up:  # (Docker) Create services/volumes/networks
 	docker compose up -d

data/v2/csv/pokedex_version_groups.csv

@@ -38,3 +38,4 @@ pokedex_id,version_group_id
 31,25
 32,26
 33,27
+34,30

data/v2/csv/pokedexes.csv

@@ -31,3 +31,4 @@ id,region_id,identifier,is_main_series
 31,10,paldea,1
 32,10,kitakami,1
 33,10,blueberry,1
+34,6,lumiose-city,1

data/v2/csv/pokemon.csv

@@ -1301,3 +1301,29 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 10275,ogerpon-cornerstone-mask,1017,12,398,275,,0
 10276,terapagos-terastal,1024,3,160,90,,0
 10277,terapagos-stellar,1024,17,770,90,,0
+10278,clefable-mega,36,17,423,,,0
+10279,victreebel-mega,71,45,1255,,,0
+10280,starmie-mega,121,23,800,,,0
+10281,dragonite-mega,149,55,2900,,,0
+10282,meganium-mega,154,24,2010,,,0
+10283,feraligatr-mega,160,23,1088,,,0
+10284,skarmory-mega,227,17,404,,,0
+10285,froslass-mega,478,26,296,,,0
+10286,emboar-mega,500,18,1803,,,0
+10287,excadrill-mega,530,9,600,,,0
+10288,scolipede-mega,545,32,2305,,,0
+10289,scrafty-mega,560,11,310,,,0
+10290,eelektross-mega,604,30,1800,,,0
+10291,chandelure-mega,609,25,696,,,0
+10292,chesnaught-mega,652,16,900,,,0
+10293,delphox-mega,655,15,390,,,0
+10294,greninja-mega,658,15,400,,,0
+10295,pyroar-mega,668,15,933,,,0
+10296,floette-mega,670,2,1008,,,0
+10297,malamar-mega,687,29,698,,,0
+10298,barbaracle-mega,689,22,1000,,,0
+10299,dragalge-mega,691,21,1003,,,0
+10300,hawlucha-mega,701,10,250,,,0
+10301,zygarde-mega,718,77,6100,,,0
+10302,drampa-mega,780,30,2405,,,0
+10303,falinks-mega,870,16,990,,,0