diff --git a/.github/workflows/nix-environment.yml b/.github/workflows/nix-environment.yml index d6bd5fc48..9373fb68b 100644 --- a/.github/workflows/nix-environment.yml +++ b/.github/workflows/nix-environment.yml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v6 with: submodules: recursive - + - name: Install Nix uses: cachix/install-nix-action@v31 with: @@ -22,7 +22,7 @@ jobs: - name: Evaluate default.nix run: nix-instantiate default.nix - + - name: Test Nix shellHook runs automatically run: | nix-shell --run " @@ -30,7 +30,7 @@ jobs: uv --version && test -d .venv && echo 'Virtual environment exists' || (echo 'Virtual environment not found' && exit 1) " - + - name: Start pokeapi in Nix environment run: | nix-shell --run " @@ -38,11 +38,11 @@ jobs: make setup && make build-db " - + - name: Test pokeapi serves correctly run: | nix-shell --run " nohup make serve & sleep 3 && curl -Ss http://localhost:8000/api/v2/pokemon/1/ | grep -q 'bulbasaur' - " \ No newline at end of file + " diff --git a/README.md b/README.md index 0cb73e848..52f725474 100755 --- a/README.md +++ b/README.md @@ -46,12 +46,15 @@ A RESTful API for Pokémon - [pokeapi.co](https://pokeapi.co) # This will install all the required packages and libraries for using PokeAPI ``` -- Install the pre-commit hooks using the Makefile commands: +- Install the pre-commit hooks using the Makefile commands (optional but recommended): ```sh make pre-commit-install ``` + > [!NOTE] + > Pre-commit hooks are optional but recommended for maintaining code quality and consistency. If you do not want it to automatically run on every commit, you can run it manually with `make pre-commit` before commiting and pushing your changes. + - Set up the local development environment using the following command: ```sh diff --git a/data/v2/csv/berries.csv b/data/v2/csv/berries.csv index f7ac3b7ec..541d45864 100644 --- a/data/v2/csv/berries.csv +++ b/data/v2/csv/berries.csv @@ -66,4 +66,4 @@ id,item_id,firmness_id,natural_gift_power,natural_gift_type_id,size,max_harvest, 65,724,,100,18,,8,72,, 66,725,,100,17,,8,72,, 67,2278,,17,,,,,, -68,2279,,,,,,,, \ No newline at end of file +68,2279,,,,,,,, diff --git a/data/v2/csv/item_game_indices.csv b/data/v2/csv/item_game_indices.csv index a9106b3c8..592668c6f 100644 --- a/data/v2/csv/item_game_indices.csv +++ b/data/v2/csv/item_game_indices.csv @@ -7294,4 +7294,4 @@ item_id,generation_id,game_index 2230,8,1691 2230,9,1691 2231,8,1692 -2231,9,1692 \ No newline at end of file +2231,9,1692 diff --git a/data/v2/csv/locations.csv b/data/v2/csv/locations.csv index 969769056..943955cd3 100644 --- a/data/v2/csv/locations.csv +++ b/data/v2/csv/locations.csv @@ -1102,4 +1102,4 @@ id,region_id,identifier 1118,8,roaming-isle-of-armor 1119,8,roaming-crown-tundra 1120,8,galar-wild-area-max-dens -1121,6,kalos-berry-fields \ No newline at end of file +1121,6,kalos-berry-fields diff --git a/default.nix b/default.nix index c192f35d2..491a3ebbb 100644 --- a/default.nix +++ b/default.nix @@ -18,4 +18,4 @@ mkShell { unset SOURCE_DATE_EPOCH uv sync --locked --all-extras --dev ''; -} \ No newline at end of file +} diff --git a/pokemon_v2/migrations/0030_alter_berry_growth_time_alter_berry_max_harvest_and_more.py b/pokemon_v2/migrations/0030_alter_berry_growth_time_alter_berry_max_harvest_and_more.py index ebd3564ca..7f081e6f9 100644 --- a/pokemon_v2/migrations/0030_alter_berry_growth_time_alter_berry_max_harvest_and_more.py +++ b/pokemon_v2/migrations/0030_alter_berry_growth_time_alter_berry_max_harvest_and_more.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("pokemon_v2", "0029_pokemonformtrigger_pokemonformcondition"), ]