omit mypy option --no-implicit-reexport

bitranox · Jan 10, 2024 · bb14312 · bb14312
1 parent dfca49e
commit bb14312
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 24 deletions.
diff --git a/.docs/README_template.rst b/.docs/README_template.rst
@@ -2,7 +2,7 @@ wrapt_timeout_decorator
 =======================
 
 
-Version v1.4.0 as of 2023-07-14 see `Changelog`_
+Version v1.4.1 as of 2024-01-10 see `Changelog`_
 
 
 .. include:: ./badges.rst

diff --git a/.docs/badges.rst b/.docs/badges.rst
@@ -20,7 +20,10 @@
 .. |pypi| image:: https://img.shields.io/pypi/status/wrapt-timeout-decorator?label=PyPI%20Package
    :target: https://badge.fury.io/py/wrapt_timeout_decorator
 
-.. |codecov| image:: https://img.shields.io/codecov/c/github/bitranox/wrapt_timeout_decorator
+.. badge until 2023-10-08:
+.. https://img.shields.io/codecov/c/github/bitranox/wrapt_timeout_decorator
+.. badge from 2023-10-08:
+.. |codecov| image:: https://codecov.io/gh/bitranox/wrapt_timeout_decorator/graph/badge.svg
    :target: https://codecov.io/gh/bitranox/wrapt_timeout_decorator
 
 .. |cc_maintain| image:: https://img.shields.io/codeclimate/maintainability-percentage/bitranox/wrapt_timeout_decorator?label=CC%20maintainability

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -45,9 +45,7 @@ jobs:
 
         # MYPY tests
         MYPY_DO_TESTS: "True"
-        # MYPY_OPTIONS: "--follow-imports=normal --ignore-missing-imports --implicit-reexport --install-types --no-warn-unused-ignores
-        # --non-interactive --strict"
-        MYPY_OPTIONS: "--follow-imports=normal --ignore-missing-imports --no-implicit-reexport --install-types --no-warn-unused-ignores --non-interactive --strict"
+        MYPY_OPTIONS: "--follow-imports=normal --ignore-missing-imports --install-types --no-warn-unused-ignores --non-interactive --strict"
         MYPYPATH: "./.3rd_party_stubs"
 
         # coverage
@@ -65,8 +63,8 @@ jobs:
         RST_INCLUDE_TARGET: "./README.rst"
         # make Code Coverage Secret available in Environment
         CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-        # make PyPi Password available in Environment
-        PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+        # make PyPi API token available in Environment
+        PYPI_UPLOAD_API_TOKEN: ${{ secrets.PYPI_UPLOAD_API_TOKEN }}
 
 
     strategy:
@@ -151,7 +149,7 @@ jobs:
               BUILD_DOCS: "False"
               BUILD: "True"  
               BUILD_TEST: "True"
-              MYPY_DO_TESTS: "False"
+              MYPY_DO_TESTS: "True"
               DO_SETUP_INSTALL: "True"
               DO_SETUP_INSTALL_TEST: "True"
               DO_CLI_TEST: "True"
@@ -162,7 +160,7 @@ jobs:
               BUILD_DOCS: "False"
               BUILD: "True"  
               BUILD_TEST: "True"
-              MYPY_DO_TESTS: "False"
+              MYPY_DO_TESTS: "True"
               DO_SETUP_INSTALL: "True"
               DO_SETUP_INSTALL_TEST: "True"
               DO_CLI_TEST: "True"

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+v1.4.1
+---------
+2024-01-10:
+    - thanks to `fayak: <https://github.com/fayak>`_
+    - omit mypy option --no-implicit-reexport
+    - explicitly export methods in ``__init__.py``
+
 v1.4.0
 ---------
 2023-07-13:

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 1990-2023 Robert Nowotny
+Copyright (c) 1990-2024 Robert Nowotny
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.rst b/README.rst
@@ -2,7 +2,7 @@ wrapt_timeout_decorator
 =======================
 
 
-Version v1.4.0 as of 2023-07-14 see `Changelog`_
+Version v1.4.1 as of 2024-01-10 see `Changelog`_
 
 |build_badge| |codeql| |license| |jupyter| |pypi|
 |pypi-downloads| |black| |codecov| |cc_maintain| |cc_issues| |cc_coverage| |snyk|
@@ -26,7 +26,10 @@ Version v1.4.0 as of 2023-07-14 see `Changelog`_
 .. |pypi| image:: https://img.shields.io/pypi/status/wrapt-timeout-decorator?label=PyPI%20Package
    :target: https://badge.fury.io/py/wrapt_timeout_decorator
 
-.. |codecov| image:: https://img.shields.io/codecov/c/github/bitranox/wrapt_timeout_decorator
+.. badge until 2023-10-08:
+.. https://img.shields.io/codecov/c/github/bitranox/wrapt_timeout_decorator
+.. badge from 2023-10-08:
+.. |codecov| image:: https://codecov.io/gh/bitranox/wrapt_timeout_decorator/graph/badge.svg
    :target: https://codecov.io/gh/bitranox/wrapt_timeout_decorator
 
 .. |cc_maintain| image:: https://img.shields.io/codeclimate/maintainability-percentage/bitranox/wrapt_timeout_decorator?label=CC%20maintainability
@@ -941,6 +944,13 @@ This software is licensed under the `MIT license <http://en.wikipedia.org/wiki/M
 Changelog
 =========
 
+v1.4.1
+---------
+2024-01-10:
+    - thanks to `fayak: <https://github.com/fayak>`_
+    - omit mypy option --no-implicit-reexport
+    - explicitly export methods in ``__init__.py``
+
 v1.4.0
 ---------
 2023-07-13:

diff --git a/pyproject.toml b/pyproject.toml
@@ -27,14 +27,14 @@ classifiers = [
 # see: https://setuptools.pypa.io/en/latest/userguide/dependency_management.html
 dependencies = [
     "cli_exit_tools",
-    "lib_detect_testenv",
-    "dill>0.3.0,!=0.3.5,!=0.3.5.1;sys_platform=='win32'",
     "dill;sys_platform!='win32'",
+    "dill>0.3.0,!=0.3.5,!=0.3.5.1;sys_platform=='win32'",
+    "lib_detect_testenv",
     "multiprocess",
     "psutil",
     "wrapt",
 ]
-version = "v1.4.0"
+version = "v1.4.1"
 # seems to be not allowed anymore
 # zip-save = false
 
@@ -51,7 +51,7 @@ test = [
     "coloredlogs",
     "coverage",
     "flake8",
-    "mypy ; platform_python_implementation != 'PyPy'",
+    "mypy",
     "pytest",
     "pytest-cov",
     "pytest-runner",
@@ -63,9 +63,9 @@ test = [
 
 [tool.setuptools.package-data]
 wrapt_timeout_decorator = [
-    "py.typed",
     "*.pyi",
     "__init__.pyi",
+    "py.typed",
 ]
 
 [tool.black]

diff --git a/requirements_test.txt b/requirements_test.txt
@@ -6,7 +6,7 @@ codecov
 coloredlogs
 coverage
 flake8
-mypy ; platform_python_implementation != "PyPy"
+mypy
 pytest
 pytest-cov
 pytest-runner

diff --git a/tests/local_testscripts/lib_bash_functions.sh b/tests/local_testscripts/lib_bash_functions.sh
@@ -147,7 +147,7 @@ function run_flake8_tests() {
 
 function run_mypy_tests() {
   my_banner "mypy tests"
-  if ! /opt/python3/bin/python3 -m mypy "${project_root_dir}" --follow-imports=normal --ignore-missing-imports --implicit-reexport --install-types --no-warn-unused-ignores --non-interactive --strict; then
+  if ! /opt/python3/bin/python3 -m mypy "${project_root_dir}" --follow-imports=normal --ignore-missing-imports --install-types --no-warn-unused-ignores --non-interactive --strict; then
     my_banner_warning "mypy tests ERROR"
     beep
     sleep "${sleeptime_on_error}"

diff --git a/wrapt_timeout_decorator/__init__.py b/wrapt_timeout_decorator/__init__.py
@@ -1,6 +1,6 @@
-from .wrapt_timeout_decorator import timeout
-from .wrap_helper import detect_unpickable_objects
-from .wrap_helper import detect_unpickable_objects_and_reraise
+from .wrapt_timeout_decorator import timeout as timeout
+from .wrap_helper import detect_unpickable_objects as detect_unpickable_objects
+from .wrap_helper import detect_unpickable_objects_and_reraise as detect_unpickable_objects_and_reraise
 
 # this needs to come after the module imports, otherwise circular import under windows
 from . import __init__conf__

diff --git a/wrapt_timeout_decorator/__init__conf__.py b/wrapt_timeout_decorator/__init__conf__.py
@@ -2,7 +2,7 @@
 
 name = 'wrapt_timeout_decorator'
 title = 'The better timout decorator'
-version = 'v1.4.0'
+version = 'v1.4.1'
 url = 'https://github.com/bitranox/wrapt_timeout_decorator'
 author = 'Robert Nowotny'
 author_email = 'bitranox@gmail.com'
@@ -16,7 +16,7 @@ def print_info() -> None:
 
     The better timout decorator
 
-    Version : v1.4.0
+    Version : v1.4.1
     Url     : https://github.com/bitranox/wrapt_timeout_decorator
     Author  : Robert Nowotny
     Email   : bitranox@gmail.com""")