diff --git a/.travis.yml b/.travis.yml index b18027e..3a418a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,11 +3,13 @@ language: python python: + - "3.12" + - "3.11" + - "3.10" - "3.9" - "3.8" - "3.7" - "3.6" - - "2.7" - "pypy" # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors diff --git a/Makefile b/Makefile index 2de101e..2ab356f 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ clean-build: rm -fr dist/ rm -fr .eggs/ find . -name '*.egg-info' -exec rm -fr {} + - find . -name '*.egg' -exec rm -f {} + + #find . -name '*.egg' -exec rm -f {} + clean-pyc: find . -name '*.pyc' -exec rm -f {} + diff --git a/docs/conf.py b/docs/conf.py index 1896999..2fd79e7 100755 --- a/docs/conf.py +++ b/docs/conf.py @@ -13,14 +13,14 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys import os +import sys # If extensions (or modules to document with autodoc) are in another # directory, add these directories to sys.path here. If the directory is # relative to the documentation root, use os.path.abspath to make it # absolute, like shown here. -#sys.path.insert(0, os.path.abspath('.')) +# sys.path.insert(0, os.path.abspath('.')) # Get the project root dir, which is the parent dir of this cwd = os.getcwd() @@ -31,32 +31,32 @@ # version is used. sys.path.insert(0, project_root) -import runenv +import runenv # noqa # -- General configuration --------------------------------------------- # If your documentation needs a minimal Sphinx version, state it here. -#needs_sphinx = '1.0' +# needs_sphinx = '1.0' # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode'] +extensions = ["sphinx.ext.autodoc", "sphinx.ext.viewcode"] # Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] +templates_path = ["_templates"] # The suffix of source filenames. -source_suffix = '.rst' +source_suffix = ".rst" # The encoding of source files. -#source_encoding = 'utf-8-sig' +# source_encoding = 'utf-8-sig' # The master toctree document. -master_doc = 'index' +master_doc = "index" # General information about the project. -project = u'runenv' -copyright = u'2015, Marek Wywiał' +project = u"runenv" +copyright = u"2015, Marek Wywiał" # noqa # The version info for the project you're documenting, acts as replacement # for |version| and |release|, also used in various other places throughout @@ -69,126 +69,126 @@ # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. -#language = None +# language = None # There are two options for replacing |today|: either, you set today to # some non-false value, then it is used: -#today = '' +# today = '' # Else, today_fmt is used as the format for a strftime call. -#today_fmt = '%B %d, %Y' +# today_fmt = '%B %d, %Y' # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. -exclude_patterns = ['_build'] +exclude_patterns = ["_build"] # The reST default role (used for this markup: `text`) to use for all # documents. -#default_role = None +# default_role = None # If true, '()' will be appended to :func: etc. cross-reference text. -#add_function_parentheses = True +# add_function_parentheses = True # If true, the current module name will be prepended to all description # unit titles (such as .. function::). -#add_module_names = True +# add_module_names = True # If true, sectionauthor and moduleauthor directives will be shown in the # output. They are ignored by default. -#show_authors = False +# show_authors = False # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' +pygments_style = "sphinx" # A list of ignored prefixes for module index sorting. -#modindex_common_prefix = [] +# modindex_common_prefix = [] # If true, keep warnings as "system message" paragraphs in the built # documents. -#keep_warnings = False +# keep_warnings = False # -- Options for HTML output ------------------------------------------- # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -html_theme = 'default' +html_theme = "default" # Theme options are theme-specific and customize the look and feel of a # theme further. For a list of options available for each theme, see the # documentation. -#html_theme_options = {} +# html_theme_options = {} # Add any paths that contain custom themes here, relative to this directory. -#html_theme_path = [] +# html_theme_path = [] # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". -#html_title = None +# html_title = None # A shorter title for the navigation bar. Default is the same as # html_title. -#html_short_title = None +# html_short_title = None # The name of an image file (relative to this directory) to place at the # top of the sidebar. -#html_logo = None +# html_logo = None # The name of an image file (within the static path) to use as favicon # of the docs. This file should be a Windows icon file (.ico) being # 16x16 or 32x32 pixels large. -#html_favicon = None +# html_favicon = None # Add any paths that contain custom static files (such as style sheets) # here, relative to this directory. They are copied after the builtin # static files, so a file named "default.css" will overwrite the builtin # "default.css". -html_static_path = ['_static'] +html_static_path = ["_static"] # If not '', a 'Last updated on:' timestamp is inserted at every page # bottom, using the given strftime format. -#html_last_updated_fmt = '%b %d, %Y' +# html_last_updated_fmt = '%b %d, %Y' # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities. -#html_use_smartypants = True +# html_use_smartypants = True # Custom sidebar templates, maps document names to template names. -#html_sidebars = {} +# html_sidebars = {} # Additional templates that should be rendered to pages, maps page names # to template names. -#html_additional_pages = {} +# html_additional_pages = {} # If false, no module index is generated. -#html_domain_indices = True +# html_domain_indices = True # If false, no index is generated. -#html_use_index = True +# html_use_index = True # If true, the index is split into individual pages for each letter. -#html_split_index = False +# html_split_index = False # If true, links to the reST sources are added to the pages. -#html_show_sourcelink = True +# html_show_sourcelink = True # If true, "Created using Sphinx" is shown in the HTML footer. # Default is True. -#html_show_sphinx = True +# html_show_sphinx = True # If true, "(C) Copyright ..." is shown in the HTML footer. # Default is True. -#html_show_copyright = True +# html_show_copyright = True # If true, an OpenSearch description file will be output, and all pages # will contain a tag referring to it. The value of this option # must be the base URL from which the finished HTML is served. -#html_use_opensearch = '' +# html_use_opensearch = '' # This is the file name suffix for HTML files (e.g. ".xhtml"). -#html_file_suffix = None +# html_file_suffix = None # Output file base name for HTML help builder. -htmlhelp_basename = 'runenvdoc' +htmlhelp_basename = "runenvdoc" # -- Options for LaTeX output ------------------------------------------ @@ -196,10 +196,8 @@ latex_elements = { # The paper size ('letterpaper' or 'a4paper'). #'papersize': 'letterpaper', - # The font size ('10pt', '11pt' or '12pt'). #'pointsize': '10pt', - # Additional stuff for the LaTeX preamble. #'preamble': '', } @@ -208,44 +206,38 @@ # (source start file, target name, title, author, documentclass # [howto/manual]). latex_documents = [ - ('index', 'runenv.tex', - u'runenv Documentation', - u'Marek Wywiał', 'manual'), + ("index", "runenv.tex", u"runenv Documentation", u"Marek Wywiał", "manual"), ] # The name of an image file (relative to this directory) to place at # the top of the title page. -#latex_logo = None +# latex_logo = None # For "manual" documents, if this is true, then toplevel headings # are parts, not chapters. -#latex_use_parts = False +# latex_use_parts = False # If true, show page references after internal links. -#latex_show_pagerefs = False +# latex_show_pagerefs = False # If true, show URL addresses after external links. -#latex_show_urls = False +# latex_show_urls = False # Documents to append as an appendix to all manuals. -#latex_appendices = [] +# latex_appendices = [] # If false, no module index is generated. -#latex_domain_indices = True +# latex_domain_indices = True # -- Options for manual page output ------------------------------------ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). -man_pages = [ - ('index', 'runenv', - u'runenv Documentation', - [u'Marek Wywiał'], 1) -] +man_pages = [("index", "runenv", u"runenv Documentation", [u"Marek Wywiał"], 1)] # If true, show URL addresses after external links. -#man_show_urls = False +# man_show_urls = False # -- Options for Texinfo output ---------------------------------------- @@ -254,22 +246,25 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'runenv', - u'runenv Documentation', - u'Marek Wywiał', - 'runenv', - 'One line description of project.', - 'Miscellaneous'), + ( + "index", + "runenv", + u"runenv Documentation", + u"Marek Wywiał", + "runenv", + "One line description of project.", + "Miscellaneous", + ), ] # Documents to append as an appendix to all manuals. -#texinfo_appendices = [] +# texinfo_appendices = [] # If false, no module index is generated. -#texinfo_domain_indices = True +# texinfo_domain_indices = True # How to display URL addresses: 'footnote', 'no', or 'inline'. -#texinfo_show_urls = 'footnote' +# texinfo_show_urls = 'footnote' # If true, do not generate a @detailmenu in the "Top" node's menu. -#texinfo_no_detailmenu = False +# texinfo_no_detailmenu = False diff --git a/pyproject.toml b/pyproject.toml index c9c9f33..b4ab98f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,7 +49,7 @@ cov = "pytest --cov-report=term-missing --cov-config=pyproject.toml --cov=runenv no-cov = "cov --no-cov {args}" [[tool.hatch.envs.all.matrix]] -python = ["2.7", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] +python = ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] [tool.coverage.run] branch = true diff --git a/runenv/__init__.py b/runenv/__init__.py index f3f601b..bf2d5d3 100755 --- a/runenv/__init__.py +++ b/runenv/__init__.py @@ -18,8 +18,8 @@ def run(*args): if not args: args = sys.argv[1:] - if len(args) < 2: - print("Usage: runenv ") + if len(args) < 2: # noqa + sys.stdout.write("Usage: runenv \n") sys.exit(0) os.environ.update(create_env(args[0])) os.environ["_RUNENV_WRAPPED"] = "1" @@ -30,9 +30,9 @@ def run(*args): try: if not (stat.S_IXUSR & os.stat(runnable_path)[stat.ST_MODE]): - print("File `%s is not executable" % runnable_path) + sys.stdout.write("File `%s is not executable\n" % runnable_path) sys.exit(1) - return subprocess.check_call(args[1:], env=os.environ) + return subprocess.check_call(args[1:], env=os.environ) # noqa except subprocess.CalledProcessError as e: return e.returncode @@ -77,7 +77,7 @@ def create_env(env_file): return environ -def load_env(env_file=".env", prefix=None, strip_prefix=True, force=False, search_parent=0): +def load_env(env_file=".env", prefix=None, strip_prefix=True, force=False, search_parent=0): # noqa: FBT002 # we need absolute path to support `search_parent` env_file = os.path.abspath(env_file) logger.info("trying env file {0}".format(env_file)) diff --git a/tests/test_runenv.py b/tests/test_runenv.py index 5786f1f..b83083b 100755 --- a/tests/test_runenv.py +++ b/tests/test_runenv.py @@ -182,37 +182,37 @@ def test_load_env_from_missing_file(self): load_env(env_file="env.missing") def test_search_parent(self): - ENV_FILE = "env.search_parent" + env_file = "env.search_parent" os.chdir(os.path.join(TESTS_DIR, "search_parent", "project")) - load_env(env_file=ENV_FILE) + load_env(env_file=env_file) self.assertFalse("PARENT" in os.environ) - load_env(env_file=ENV_FILE) + load_env(env_file=env_file) self.assertFalse("PARENT" in os.environ) - load_env(env_file=ENV_FILE, search_parent=1) + load_env(env_file=env_file, search_parent=1) self.assertTrue("PARENT" in os.environ) self.assertEqual(os.environ.get("PARENT"), "2") - load_env(env_file=ENV_FILE, search_parent=2) + load_env(env_file=env_file, search_parent=2) self.assertTrue("PARENT" in os.environ) self.assertEqual(os.environ.get("PARENT"), "2") def test_search_grand_parent(self): - ENV_FILE = "env.search_grandparent" + env_file = "env.search_grandparent" os.chdir(os.path.join(TESTS_DIR, "search_grandparent", "project")) - load_env(env_file=ENV_FILE) + load_env(env_file=env_file) self.assertFalse("GRAND_PARENT" in os.environ) - load_env(env_file=ENV_FILE) + load_env(env_file=env_file) self.assertFalse("GRAND_PARENT" in os.environ) - load_env(env_file=ENV_FILE, search_parent=1) + load_env(env_file=env_file, search_parent=1) self.assertFalse("GRAND_PARENT" in os.environ) - load_env(env_file=ENV_FILE, search_parent=2) + load_env(env_file=env_file, search_parent=2) self.assertTrue("GRAND_PARENT" in os.environ) self.assertEqual(os.environ.get("GRAND_PARENT"), "3")