diff --git a/.pylintrc b/.pylintrc deleted file mode 100644 index 85e9ad7..0000000 --- a/.pylintrc +++ /dev/null @@ -1,334 +0,0 @@ -[MASTER] - -# Pickle collected data for later comparisons. -persistent=no - -# List of plugins (as comma separated values of python modules names) to load, -# usually to register additional checkers. -load-plugins= - -# Use multiple processes to speed up Pylint. -jobs=1 - -[REPORTS] - -# Set the output format. Available formats are text, parseable, colorized, msvs -# (visual studio) and html. You can also give a reporter class, eg -# mypackage.mymodule.MyReporterClass. -output-format=colorized - -# Tells whether to display a full report or only the messages -reports=no - -# Template used to display messages. This is a python new-style format string -# used to format the message information. See doc for all details -#msg-template= - - -[MESSAGES CONTROL] - -# Only show warnings with the listed confidence levels. Leave empty to show -# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED -confidence= - -# Enable the message, report, category or checker with the given id(s). You can -# either give multiple identifier separated by comma (,) or put this option -# multiple time. See also the "--disable" option for examples. -#enable= - -# Disable the message, report, category or checker with the given id(s). You -# can either give multiple identifiers separated by comma (,) or put this -# option multiple times (only on the command line, not in the configuration -# file where it should appear only once).You can also use "--disable=all" to -# disable everything first and then reenable specific checks. For example, if -# you want to run only the similarities checker, you can use "--disable=all -# --enable=similarities". If you want to run only the classes checker, but have -# no Warning level messages displayed, use"--disable=all --enable=classes -# --disable=W" - -# Disable F0401 to hide issues with Pylint importing modules. -disable=F0401 - - -[MISCELLANEOUS] - -# List of note tags to take in consideration, separated by a comma. -notes=FIXME,XXX,TODO,NOTE - - -[LOGGING] - -# Logging modules to check that the string format arguments are in logging -# function parameter format -logging-modules=logging - - -[VARIABLES] - -# Tells whether we should check for unused import in __init__ files. -init-import=no - -# A regular expression matching the name of dummy variables (i.e. expectedly -# not used). -dummy-variables-rgx=_$|dummy - -# List of additional names supposed to be defined in builtins. Remember that -# you should avoid to define new builtins when possible. -additional-builtins= - -# List of strings which can identify a callback function by name. A callback -# name must start or end with one of those strings. -callbacks=cb_,_cb - - -[SIMILARITIES] - -# Minimum lines number of a similarity. -min-similarity-lines=4 - -# Ignore comments when computing similarities. -ignore-comments=yes - -# Ignore docstrings when computing similarities. -ignore-docstrings=yes - -# Ignore imports when computing similarities. -ignore-imports=yes - - -[TYPECHECK] - -# Tells whether missing members accessed in mixin class should be ignored. A -# mixin class is detected if its name ends with "mixin" (case insensitive). -ignore-mixin-members=yes - -# List of module names for which member attributes should not be checked -# (useful for modules/projects where namespaces are manipulated during runtime -# and thus existing member attributes cannot be deduced by static analysis -ignored-modules= - -# List of classes names for which member attributes should not be checked -# (useful for classes with attributes dynamically set). -ignored-classes= - -# List of members which are set dynamically and missed by pylint inference -# system, and so shouldn't trigger E0201 when accessed. Python regular -# expressions are accepted. -generated-members= - - -[SPELLING] - -# Spelling dictionary name. Available dictionaries: en_US. To make it working -# install python-enchant package. -spelling-dict=en_US - -# List of comma separated words that should not be checked. -spelling-ignore-words=config,namespace,iterable,json,ini,regex,namespaces,str,JSON,INI,init,behaviour,setattr,getattr,classmethod,instancemethod,dict,bool,metadata,iteritems,args,kwargs,cls,iter,subclass,subclasses,api,API,unicode,proxied,hasattr,prepend,prepended,os,env,cli,CLI,arg,args,argv,url,URL,uninstall,mixin,Mixin,pip,subshell,csh,sh,symlink,symlinked,symlinking,pypi,cmd,txt,preun,postun,pre,post,virtualenv,virtualenvs,dict,dicts,noreplace,buildroot,docstring,docstrings,version,versioning,confpy,rpmvenv,spec,specfile,popen,shlex,rpmbuild,returncode - -# A path to a file that contains private dictionary; one word per line. -spelling-private-dict-file= - -# Tells whether to store unknown words to indicated private dictionary in -# --spelling-private-dict-file option instead of raising a message. -spelling-store-unknown-words=no - - -[BASIC] - -# Required attributes for module, separated by a comma -required-attributes= - -# List of builtins function names that should not be used, separated by a comma -bad-functions= - -# Good variable names which should always be accepted, separated by a comma -good-names=_ - -# Bad variable names which should always be refused, separated by a comma -bad-names=foo,bar,baz,toto,tutu,tata,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z - -# Colon-delimited sets of names that determine each other's naming style when -# the name regexes allow several styles. -name-group= - -# Include a hint for the correct naming format with invalid-name -include-naming-hint=no - -# Regular expression matching correct class attribute names -class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ - -# Naming hint for class attribute names -class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ - -# Regular expression matching correct module names -module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ - -# Naming hint for module names -module-name-hint=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ - -# Regular expression matching correct class names -# Adding zip due to pylint confusion. -class-rgx=(([A-Z_][a-zA-Z0-9]+)|(zip)|(basestring))$ - -# Naming hint for class names -class-name-hint=[A-Z_][a-zA-Z0-9]+$ - -# Regular expression matching correct attribute names -attr-rgx=[a-z_][a-z0-9_]{2,30}$ - -# Naming hint for attribute names -attr-name-hint=[a-z_][a-z0-9_]{2,30}$ - -# Regular expression matching correct constant names -# Adding some names used in the pycompat file. -const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__)|(zip)|(long)|(unicode)|(range)|(basestring)|(cfg))$ - -# Naming hint for constant names -const-name-hint=(([A-Z_][A-Z0-9_]*)|(__.*__))$ - -# Regular expression matching correct function names -function-rgx=[a-z_][a-z0-9_]{2,30}$ - -# Naming hint for function names -function-name-hint=[a-z_][a-z0-9_]{2,30}$ - -# Regular expression matching correct variable names -variable-rgx=[a-z_][a-z0-9_]{2,30}$ - -# Naming hint for variable names -variable-name-hint=[a-z_][a-z0-9_]{2,30}$ - -# Regular expression matching correct inline iteration names -inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$ - -# Naming hint for inline iteration names -inlinevar-name-hint=[A-Za-z_][A-Za-z0-9_]*$ - -# Regular expression matching correct method names -method-rgx=[a-z_][a-z0-9_]{2,30}$ - -# Naming hint for method names -method-name-hint=[a-z_][a-z0-9_]{2,30}$ - -# Regular expression matching correct argument names -argument-rgx=[a-z_][a-z0-9_]{2,30}$ - -# Naming hint for argument names -argument-name-hint=[a-z_][a-z0-9_]{2,30}$ - -# Regular expression which should only match function or class names that do -# not require a docstring. -no-docstring-rgx=__.*__ - -# Minimum line length for functions/classes that require docstrings, shorter -# ones are exempt. -docstring-min-length=-1 - - -[FORMAT] - -# Maximum number of characters on a single line. -max-line-length=80 - -# Regexp for a line that is allowed to be longer than the limit. -ignore-long-lines=^\s*(# )??$ - -# Allow the body of an if to be on the same line as the test if there is no -# else. -single-line-if-stmt=no - -# List of optional constructs for which whitespace checking is disabled -no-space-check=trailing-comma,dict-separator - -# Maximum number of lines in a module -max-module-lines=1000 - -# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 -# tab). -indent-string=' ' - -# Number of spaces of indent required inside a hanging or continued line. -indent-after-paren=4 - -# Expected format of line ending, e.g. empty (any line ending), LF or CRLF. -expected-line-ending-format= - - -[CLASSES] - -# List of interface methods to ignore, separated by a comma. This is used for -# instance to not check methods defines in Zope's Interface base class. -ignore-iface-methods= - -# List of method names used to declare (i.e. assign) instance attributes. -defining-attr-methods=__init__,__new__ - -# List of valid names for the first argument in a class method. -valid-classmethod-first-arg=cls - -# List of valid names for the first argument in a metaclass class method. -valid-metaclass-classmethod-first-arg=mcs - -# List of member names, which should be excluded from the protected access -# warning. -exclude-protected=_asdict,_fields,_replace,_source,_make - - -[IMPORTS] - -# Deprecated modules which should not be used, separated by a comma -deprecated-modules=stringprep,optparse - -# Create a graph of every (i.e. internal and external) dependencies in the -# given file (report RP0402 must not be disabled) -import-graph= - -# Create a graph of external dependencies in the given file (report RP0402 must -# not be disabled) -ext-import-graph= - -# Create a graph of internal dependencies in the given file (report RP0402 must -# not be disabled) -int-import-graph= - - -[DESIGN] - -# Maximum number of arguments for function / method -max-args=5 - -# Argument names that match this expression will be ignored. Default to name -# with leading underscore -ignored-argument-names=_.* - -# Maximum number of locals for function / method body -max-locals=15 - -# Maximum number of return / yield for function / method body -max-returns=6 - -# Maximum number of branch for function / method body -max-branches=12 - -# Maximum number of statements in function / method body -max-statements=50 - -# Maximum number of parents for a class (see R0901). -max-parents=7 - -# Maximum number of attributes for a class (see R0902). -max-attributes=7 - -# Minimum number of public methods for a class (see R0903). -min-public-methods=0 - -# Maximum number of public methods for a class (see R0904). -max-public-methods=20 - - -[EXCEPTIONS] - -# Exceptions that will emit a warning when being caught. Defaults to -# "Exception" -overgeneral-exceptions=Exception diff --git a/README.rst b/README.rst index 981aae1..4f10f35 100644 --- a/README.rst +++ b/README.rst @@ -32,6 +32,8 @@ rpmvenv - `NOTE: bdist eggs with scripts <#note-bdist-eggs-with-scripts>`_ +- `NOTE: BUILDROOT errors and nushell <#note-buildroot-errors-and-nushell>`_ + - `Testing <#testing>`_ - `License <#license>`_ @@ -194,7 +196,8 @@ This extension will allow for packaging any files even if they are not a part of the built project. This extension is enabled by adding "file_extras" in the list of enabled extensions. This extension also requires that 'file_permissions' be enabled. It uses the same user and group to assign -ownership of the extra files. Source paths are relative to the root. +ownership of the extra files by default but allows for individual files to have +special permissions set. Source paths are relative to the root. .. code-block:: javascript @@ -204,6 +207,17 @@ ownership of the extra files. Source paths are relative to the root. "src": "somedir/project_init_script", "dest": "etc/init.d/project", }, + { + "src": "somedir/with/perms", + "dest": "etc/with/perms", + "attr": { + "permissions": "0644", + // Leaving user or group unspecified means they use the + // default value from files_permissions. + "user": "testuser", + "group": "testgroup" + } + }, { "src": "somedir/readme", "dest": "usr/share/doc/project/readme", @@ -407,6 +421,36 @@ which switches the installation method from `python setup.py install` to because `pip` will always generate a wheel rather than an egg which does not suffer from this issue. +NOTE: BUILDROOT errors and nushell +================================== + +If you are using recent versions of virtualenv then you may see error messages +like this:: + + /tmp/rpmvenvz_kldppd/BUILDROOT/test-pkg-1.2.3.4-1.x86_64/usr/share/python/test-pkg-venv/bin/activate.nu + Found '/tmp/rpmvenvz_kldppd/BUILDROOT/test-pkg-1.2.3.4-1.x86_64' in installed files; aborting + +The issue is that virtualenv recently changed the contents of the nushell +activation script that is included by default in every virtualenv. There's an +`issue `_ tracking this for +`venvctrl`, which is the tool used by `rpmvenv` to rewrite virtualenv paths. + +In the meantime, the easiest workaround is to disable nushell if you aren't +using it. To do this, set your `python_venv.flags` option like this: + +.. code-block:: javascript + + { + "python_venv": { + "flags": ["--always-copy", "--activators", "bash,python"] + } + } + +This disables the generation of all activation scripts except one for bash and +Python. See `the virtualenv docs +`_ for the +full set of possible activators if you need more than bash and Python. + Testing ======= diff --git a/rpmvenv/extensions/files/extras.py b/rpmvenv/extensions/files/extras.py index 476fd62..13568cf 100644 --- a/rpmvenv/extensions/files/extras.py +++ b/rpmvenv/extensions/files/extras.py @@ -62,7 +62,7 @@ def generate(config, spec): ) else: # file with a modifier (e.g. doc) but no additional option - file_directive += file_directive + '%{1} /{0}'.format( + file_directive += '%{1} /{0}'.format( file_.dest, file_.file_type) else: diff --git a/test-requirements.txt b/test-requirements.txt index 9953c89..367d92b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,5 +1,4 @@ -isort==5.10.1 -pycodestyle==2.8.0 -pyflakes==2.4.0 -pylint==2.12.2 -pytest==6.2.5 +# isort >=5.0.0, <6.0.0 +pycodestyle >=2.0.0, <3.0.0 +pyflakes >=2.0.0, <3.0.0 +pytest >=6.0.0, <7.0.0 diff --git a/tests/conftest.py b/tests/conftest.py index 41d73ea..a3326f0 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -23,7 +23,9 @@ def pytest_addoption(parser): parser.addoption( "--python_ver", help="Python version to use in the test.", - default="python3.9", + default=( + "python{0}.{1}".format(sys.version_info[0], sys.version_info[1]) + ), ) parser.addoption( "--skip-binary-strip", @@ -147,6 +149,7 @@ def python_config_file( }, "python_venv": { "cmd": "virtualenv", + "flags": ["--always-copy", "--activators", "bash,python"], "name": "test-pkg-venv", "path": "/usr/share/python", "python": python, diff --git a/tox.ini b/tox.ini index 80c9a9b..81233ad 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py36,py37,py38,py39,py310,pep8,pyflakes,pylint +envlist = py37,py38,py39,py310,pyt311,pep8,pyflakes [testenv] deps= @@ -21,6 +21,3 @@ commands= commands= pyflakes rpmvenv/ pyflakes tests/ - -[testenv:pylint] -commands=pylint --rcfile=.pylintrc rpmvenv/