Merge branch 'master' into nothead31/issue66

deep_translator/__init__.py

@@ -10,6 +10,7 @@ from .qcri import QCRI
 from .deepl import DeepL
 from .detection import single_detection, batch_detection
 from .microsoft import MicrosoftTranslator
+from .papago import PapagoTranslator
 
 # TODO: Discussion: These should be declared in setup.cfg, setting them here is redundant
 __author__ = """Nidhal Baccouri"""

docs/conf.py

@@ -21,7 +21,7 @@ import os
 import sys
 sys.path.insert(0, os.path.abspath('..'))
 
-import deep_translator
+# import deep_translator
 
 # -- General configuration ---------------------------------------------
 
@@ -57,9 +57,9 @@ author = "Nidhal Baccouri"
 # the built documents.
 #
 # The short X.Y version.
-version = deep_translator.__version__
+# version = deep_translator.__version__
 # The full version, including alpha/beta/rc tags.
-release = deep_translator.__version__
+# release = deep_translator.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.cfg

@@ -35,6 +35,11 @@ keywords = deep_translator, deepL, DeepL, translator, translation, automation,
     YANDEX, MyMemory translator, Linguee, QCRI, Language, Language detection, 
     detect language, free translation, unlimited translation, translate for free
 
+[build_sphinx]
+version = 1.4.4
+release = 1.4.4
+
+# TODO: These can be switched back on if the CI platform changes from Travis. Travis still requires setup.py to function properly.
 # [options]
 # zip_safe = 0
 # setup_requires = pytest-runner
@@ -52,20 +57,23 @@ keywords = deep_translator, deepL, DeepL, translator, translation, automation,
 # [options.packages.find]
 # where = deep_translator
 
+# TODO: This can be removed once Sphinx confirms it reads the version tags from here. The tags might be simplified by referencing metadata.version
 # bumpversion config
-[bumpversion]
-current_version = 1.4.4
-commit = True
-tag = True
+# [bumpversion]
+# current_version = 1.4.4
+# commit = True
+# tag = True
+
+# [bumpversion:file:setup.py]
+# search = version='{current_version}'
+# replace = version='{new_version}'
 
-[bumpversion:file:setup.py]
-search = version='{current_version}'
-replace = version='{new_version}'
+# [bumpversion:file:deep_translator/__init__.py]
+# search = __version__ = '{current_version}'
+# replace = __version__ = '{new_version}'
 
-[bumpversion:file:deep_translator/__init__.py]
-search = __version__ = '{current_version}'
-replace = __version__ = '{new_version}'
 
+# TODO: These are all optional settings, turned on for now since they exist already.
 [bdist_wheel]
 universal = 1