rhodecode-vcsserver Files · pkgs/patches/pytest/setuptools.patch

release: merge back stable branch into default

milka - - Load All Authors

File last commit:

r919:648a9697 stable


                r925:b5d58901

default

Download file

             setuptools.patch
        
                    11 lines
            
             | 526 B
            
                | text/x-diff
            
             |
                DiffLexer
            
             / pkgs / patches / pytest / setuptools.patch
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      diff -rup pytest-4.6.5-orig/setup.py pytest-4.6.5/setup.py

      --- pytest-4.6.5-orig/setup.py	2018-04-10 10:23:04.000000000 +0200

      +++  pytest-4.6.5/setup.py	2018-04-10 10:23:34.000000000 +0200

      @@ -24,7 +24,7 @@ INSTALL_REQUIRES = [

       def main():

           setup(

               use_scm_version={"write_to": "src/_pytest/_version.py"},

      -        setup_requires=["setuptools-scm", "setuptools>=40.0"],

      +        setup_requires=["setuptools-scm", "setuptools<=42.0"],

               package_dir={"": "src"},

               # fmt: off

               extras_require={

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				diff -rup pytest-4.6.5-orig/setup.py pytest-4.6.5/setup.py
				--- pytest-4.6.5-orig/setup.py 2018-04-10 10:23:04.000000000 +0200
				+++ pytest-4.6.5/setup.py 2018-04-10 10:23:34.000000000 +0200
				@@ -24,7 +24,7 @@ INSTALL_REQUIRES = [
				def main():
				setup(
				use_scm_version={"write_to": "src/_pytest/_version.py"},
				- setup_requires=["setuptools-scm", "setuptools>=40.0"],
				+ setup_requires=["setuptools-scm", "setuptools<=42.0"],
				package_dir={"": "src"},
				# fmt: off
				extras_require={