Merge pull request #360 from python/dont_sort_dict

raulcd · web-flow · commit 34a8ed33ccd5 · 2020-05-24T22:16:07.000+02:00
remove the requirement to sort the dict file.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -9,8 +9,3 @@ repos:
     hooks:
     -   id: pospell
         args: ['--personal-dict', 'dict', '--modified', '--language', 'es_ES', '--language', 'es_AR']
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.5.0
-    hooks:
-    -   id: file-contents-sorter
-        files: dict
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,7 @@ install:
 script:
   - powrap --check --quiet **/*.po
   - pospell -p dict -l es_AR -l es_ES **/*.po
+  - make dict_dups
   - make build
 branches:
   only:
diff --git a/Makefile b/Makefile
@@ -31,6 +31,7 @@ help:
 	@echo " spell        Check spelling"
 	@echo " wrap         Wrap all the PO files to a fixed column width"
 	@echo " progress     To compute current progression on the tutorial"
+	@echo " dict_dups	Check duplicated entries on the dict"
 	@echo ""
 
 
@@ -94,3 +95,17 @@ spell: venv
 .PHONY: wrap
 wrap: venv
 	$(VENV)/bin/powrap **/*.po
+
+.PHONY: dict_dups
+SHELL:=/bin/bash
+.ONESHELL:
+dict_dups:
+	if [[ $$(cat dict| sort | uniq -dc) ]]; then\
+		echo -e "\n\n\n ####################### \n\n\n"
+		echo "duplicated lines in the dict file"
+		uniq -dc dict
+		exit 1
+	else
+		echo "no duplicated lines"
+		exit 0
+	fi
diff --git a/dict b/dict
@@ -26,7 +26,6 @@ Cookbook
 Ctrl
 Cython
 Distutils
-Distutils
 FLTK
 Fibonacci
 Finder
@@ -42,7 +41,6 @@ Gtk+
 HTML
 Hammond
 Hat
-Hat
 Henstridge
 Hewlett
 Hugunin
@@ -66,7 +64,6 @@ Mac
 MacOS
 Macintosh
 Mandrake
-Mandrake
 Mark
 Microsoft
 Mitch
@@ -106,10 +103,8 @@ SciPy
 SimpleFileExFlags
 Smalltalk
 Solaris
-Solaris
 Spot
 Stein
-subdirectorios
 TCP
 Tcl
 Tix
@@ -144,7 +139,6 @@ backspace
 bash
 batch
 bdist
-bdist
 big-endian
 bloqueante
 booleano
@@ -183,14 +177,11 @@ criptográficamente
 curses
 customización
 customizarlo
-códec
 datagramas
 debugueando
 default
 desasignar
-descompresor
 deserialización
-deserializar
 desreferenciar
 desalojable
 desambiguar
@@ -203,11 +194,7 @@ descargable
 desasignarán
 desasignador
 desasignadores
-descargable
-desasignada
-descargable
 descompresor
-deserialización
 deserializar
 desinstalador
 designadores
@@ -342,28 +329,21 @@ naif
 nonlocal
 object
 obsérvese
-option
 or
 ordenables
 path
 pathlib
 multiprocesamiento
 mutex
 mxBase
-mxBase
 naíf
 naífs
 ncurses
-nonlocal
 normalización
-object
 operando
-operandos
 onexit
-operandos
 option
 operandos
-or
 os
 pads
 parsea
@@ -439,7 +419,6 @@ script
 scripting
 scripts
 sdux
-sdux
 search
 secuencialmente
 seguirle
