Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stability Update 20220425 #45

Merged
merged 11 commits into from
May 4, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ PHONY: must_be_root cleanup

build:
$(QUIET)$(ECHO) "INFO: No need to build. Try 'make -f Makefile install'"
$(QUIET)$(PYTHON) setup.py build
$(QUIET)$(PYTHON) setup.py bdist_wheel --universal
$(QUIET)$(PYTHON) -W ignore setup.py build
$(QUIET)$(PYTHON) -W ignore setup.py bdist_wheel --universal
reactive-firewall marked this conversation as resolved.
Show resolved Hide resolved
$(QUITE)$(WAIT)
$(QUIET)$(ECHO) "build DONE."

Expand All @@ -98,8 +98,8 @@ uninstall:
$(QUIET)$(ECHO) "$@: Done."

purge: clean uninstall
$(QUIET)$(PYTHON) ./setup.py uninstall 2>/dev/null || true
$(QUIET)$(PYTHON) ./setup.py clean || true
$(QUIET)$(PYTHON) -W ignore ./setup.py uninstall 2>/dev/null || true
$(QUIET)$(PYTHON) -W ignore ./setup.py clean || true
reactive-firewall marked this conversation as resolved.
Show resolved Hide resolved
$(QUIET)$(RMDIR) ./build/ 2>/dev/null || true
$(QUIET)$(RMDIR) ./dist/ 2>/dev/null || true
$(QUIET)$(RMDIR) ./.eggs/ 2>/dev/null || true
Expand Down
1 change: 0 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ long_description_content_type = text/markdown
home_page = https://github.com/reactive-firewall/multicast
download_url = https://github.com/reactive-firewall/multicast.git
license = MIT
license_file = LICENSE.md
reactive-firewall marked this conversation as resolved.
Show resolved Hide resolved
license_files =
LICENSE[.md]*

Expand Down
17 changes: 15 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,17 @@
"""

try:
import os, warnings
warnings.simplefilter("default") # Change the filter in this process
os.environ["PYTHONWARNINGS"] = "default" # Also affect subprocesses
reactive-firewall marked this conversation as resolved.
Show resolved Hide resolved
from setuptools import setup
from setuptools import find_packages
from setuptools.config import read_configuration
with warnings.catch_warnings():
warnings.simplefilter("ignore")
try:
from setuptools.config import read_configuration
except Exception:
from setuptools.config.setupcfg import read_configuration
except Exception:
raise NotImplementedError("""[CWE-440] Not Implemented.""")

Expand Down Expand Up @@ -78,7 +86,12 @@ def readFile(filename):
requirements = None


conf_dict = read_configuration("""setup.cfg""", ignore_option_errors=True)
conf_dict = None


with warnings.catch_warnings():
warnings.simplefilter("ignore")
conf_dict = read_configuration("""setup.cfg""", ignore_option_errors=True)
reactive-firewall marked this conversation as resolved.
Show resolved Hide resolved


readme = readFile("""README.md""")
Expand Down