rpms / python37

Clone
Source Code
GIT

#20 F27: Update to 3.7.0b4
Merged 5 years ago by churchyard. Opened 5 years ago by churchyard.
rpms/ churchyard/python37 f27-b4  into  f27

file modified
+16 -7 
@@ -1,5 +1,5 @@ 
 

  diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
 

- index d69e09f..5cb12df 100644
 

+ index 7ff938b..8c3d062 100644
 

  --- a/Lib/ensurepip/__init__.py
 

  +++ b/Lib/ensurepip/__init__.py
 

  @@ -1,8 +1,10 @@
 
@@ -13,16 +13,25 @@ 
 

   

   

   __all__ = ["version", "bootstrap"]
 

- @@ -25,6 +27,8 @@ def _run_pip(args, additional_paths=None):
 

+ @@ -24,8 +26,15 @@ def _run_pip(args, additional_paths=None):
 

+          sys.path = additional_paths + sys.path
 

   

       # Install the bundled software
 

-      import pip
 

+ -    import pip._internal
 

+ -    return pip._internal.main(args)
 

+ +    try:
 

+ +        # pip 10
 

+ +        from pip._internal import main
 

+ +    except ImportError:
 

+ +        # pip 9
 

+ +        from pip import main
 

  +    if args[0] in ["install", "list", "wheel"]:
 

  +        args.append('--pre')
 

-      return pip.main(args)
 

+ +    return main(args)
 

   

   

- @@ -88,20 +92,39 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
 

+  def version():
 

+ @@ -88,20 +97,39 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
 

           # omit pip and easy_install
 

           os.environ["ENSUREPIP_OPTIONS"] = "install"
 

   
@@ -222,10 +231,10 @@ 
 

  +            pass # bad RECORD or empty line
 

  +    return to_write, to_omit
 

  diff --git a/Makefile.pre.in b/Makefile.pre.in
 

- index 51e8132..42b3d29 100644
 

+ index d07b312..1c6720e 100644
 

  --- a/Makefile.pre.in
 

  +++ b/Makefile.pre.in
 

- @@ -1241,7 +1241,7 @@ LIBSUBDIRS=	tkinter tkinter/test tkinter/test/test_tkinter \
 

+ @@ -1301,7 +1301,7 @@ LIBSUBDIRS=	tkinter tkinter/test tkinter/test/test_tkinter \
 

   		test/test_asyncio \
 

   		collections concurrent concurrent/futures encodings \
 

   		email email/mime test/test_email test/test_email/data \

file modified
+21 -20 
@@ -1,7 +1,21 @@ 
 

- diff -up Python-3.5.0/configure.ac.than Python-3.5.0/configure.ac
 

- --- Python-3.5.0/configure.ac.than	2015-11-13 11:51:32.039560172 -0500
 

- +++ Python-3.5.0/configure.ac	2015-11-13 11:52:11.670168157 -0500
 

- @@ -788,9 +788,9 @@ cat >> conftest.c <<EOF
 

+ diff --git a/config.sub b/config.sub
 

+ index ba37cf9..52a9ec6 100755
 

+ --- a/config.sub
 

+ +++ b/config.sub
 

+ @@ -1042,7 +1042,7 @@ case $basic_machine in
 

+  		;;
 

+  	ppc64)	basic_machine=powerpc64-unknown
 

+  		;;
 

+ -	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 

+ +	ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
 

+  		;;
 

+  	ppc64le | powerpc64little)
 

+  		basic_machine=powerpc64le-unknown
 

+ diff --git a/configure.ac b/configure.ac
 

+ index 2535969..9fb3193 100644
 

+ --- a/configure.ac
 

+ +++ b/configure.ac
 

+ @@ -765,9 +765,9 @@ cat >> conftest.c <<EOF
 

           alpha-linux-gnu
 

   # elif defined(__ARM_EABI__) && defined(__ARM_PCS_VFP)
 

   #  if defined(__ARMEL__)
 
@@ -13,7 +27,7 @@ 
 

   #  endif
 

   # elif defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP)
 

   #  if defined(__ARMEL__)
 

- @@ -810,7 +810,7 @@ cat >> conftest.c <<EOF
 

+ @@ -807,7 +807,7 @@ cat >> conftest.c <<EOF
 

   #  elif _MIPS_SIM == _ABIN32
 

           mips64el-linux-gnuabin32
 

   #  elif _MIPS_SIM == _ABI64
 
@@ -22,7 +36,7 @@ 
 

   #  else
 

   #   error unknown platform triplet
 

   #  endif
 

- @@ -820,7 +820,7 @@ cat >> conftest.c <<EOF
 

+ @@ -817,7 +817,7 @@ cat >> conftest.c <<EOF
 

   #  elif _MIPS_SIM == _ABIN32
 

           mips64-linux-gnuabin32
 

   #  elif _MIPS_SIM == _ABI64
 
@@ -31,7 +45,7 @@ 
 

   #  else
 

   #   error unknown platform triplet
 

   #  endif
 

- @@ -830,9 +830,9 @@ cat >> conftest.c <<EOF
 

+ @@ -827,9 +827,9 @@ cat >> conftest.c <<EOF
 

           powerpc-linux-gnuspe
 

   # elif defined(__powerpc64__)
 

   #  if defined(__LITTLE_ENDIAN__)
 
@@ -43,16 +57,3 @@ 
 

   #  endif
 

   # elif defined(__powerpc__)
 

           powerpc-linux-gnu
 

- diff --git a/config.sub b/config.sub
 

- index 40ea5df..932128b 100755
 

- --- a/config.sub
 

- +++ b/config.sub
 

- @@ -1045,7 +1045,7 @@ case $basic_machine in
 

-  		;;
 

-  	ppc64)	basic_machine=powerpc64-unknown
 

-  		;;
 

- -	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 

- +	ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 

-  		;;
 

-  	ppc64le | powerpc64little)
 

-  		basic_machine=powerpc64le-unknown

file added
+13 
@@ -0,0 +1,13 @@ 
 

+ diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
 

+ index da0135b..1b27b5f 100644
 

+ --- a/Lib/test/test_posix.py
 

+ +++ b/Lib/test/test_posix.py
 

+ @@ -1463,7 +1463,7 @@ class TestPosixSpawn(unittest.TestCase):
 

+          """
 

+          pid = posix.posix_spawn(sys.executable,
 

+                                  [sys.executable, '-c', script],
 

+ -                                {'foo': 'bar'})
 

+ +                                {**os.environ, 'foo': 'bar'})
 

+          self.assertEqual(os.waitpid(pid, 0), (pid, 0))
 

+          with open(envfile) as f:
 

+              self.assertEqual(f.read(), 'bar')

file modified
+27 -6 
@@ -13,12 +13,12 @@ 
 

  

  

  # Third beta
 

- %global prerel b3
 

+ %global prerel b4
 

  

  #  WARNING  When rebasing to a new Python version,
 

  #           remember to update the python3-docs package as well
 

  Version: %{pybasever}.0
 

- Release: 0.14.%{?prerel}%{?dist}
 

+ Release: 0.18.%{?prerel}%{?dist}
 

  License: Python
 

  

  
@@ -350,6 +350,13 @@ 
 

  # and: https://src.fedoraproject.org/rpms/redhat-rpm-config/c/078af19
 

  Patch291: 00291-setup-Link-ctypes-against-dl-explicitly.patch
 

  

+ # 00304 #
 

+ # Pass os.environ to new process created at test_posix::test_specify_environment
 

+ # Otherwise important variables such as LD_LIBRARY_PATH are not set and the
 

+ # child process might not work at all
 

+ # Proposed upstream: https://bugs.python.org/issue33455
 

+ Patch304: 00304-test-posix-pass-environ.patch
 

+ 

  # (New patches go here ^^^)
 

  #
 

  # When adding new patches to "python" and "python3" in Fedora, EL, etc.,
 
@@ -379,7 +386,7 @@ 
 

  Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 

  

  # In order to support multiple Python interpreters for development purposes,
 

- # packages with with the naming scheme flatpackage (e.g. python35) exist for
 

+ # packages with the naming scheme flatpackage (e.g. python35) exist for
 

  # non-default versions of Python 3.
 

  # For consistency, and to keep the upgrade path clean, we Provide/Obsolete
 

  # these names here.
 
@@ -477,7 +484,12 @@ 
 

  BuildRequires: python-rpm-macros
 

  Requires: python-rpm-macros
 

  Requires: python3-rpm-macros
 

+ 

+ %if %{with rewheel}
 

+ # without rewheel is used to bootstrap setuptools+pip
 

+ # python3-rpm-generators needs python3-setuptools, so we cannot have it yet
 

  Requires: python3-rpm-generators
 

+ %endif
 

  

  # https://bugzilla.redhat.com/show_bug.cgi?id=1217376
 

  # https://bugzilla.redhat.com/show_bug.cgi?id=1496757
 
@@ -609,12 +621,14 @@ 
 

  %global __provides_exclude ^python\\(abi\\) = 3\\..$
 

  

  # We keep those inside on purpose
 

- Provides: bundled(python3-pip) = 9.0.3
 

+ Provides: bundled(python3-pip) = 10.0.1
 

  Provides: bundled(python3-setuptools) = 39.0.1
 

  

- # The descripton for the flat flatpackage package
 

+ # The description for the flat package
 

  %description
 

- This package exists to allow developers to test their code against an newer
 

+ Python %{pybasever} package for developers.
 

+ 

+ This package exists to allow developers to test their code against a newer
 

  version of Python. This is not a full Python stack and if you wish to run
 

  your applications with Python %{pybasever}, update your Fedora to a newer
 

  version once Python %{pybasever} is stable.
 
@@ -660,6 +674,7 @@ 
 

  %patch251 -p1
 

  %patch274 -p1
 

  %patch291 -p1
 

+ %patch304 -p1
 

  

  

  # Remove files that should be generated by the build
 
@@ -1564,6 +1579,12 @@ 
 

  # ======================================================
 

  

  %changelog
 

+ * Sat May 12 2018 Miro Hrončok <mhroncok@redhat.com> - 3.7.0-0.18.b4
 

+ - Bump the bundled pip version to 10.0.1
 

+ 

+ * Thu May 10 2018 Miro Hrončok <mhroncok@redhat.com> - 3.7.0-0.17.b4
 

+ - Update to 3.7.0b4
 

+ 

  * Thu Mar 29 2018 Miro Hrončok <mhroncok@redhat.com> - 3.7.0-0.14.b3
 

  - Update to 3.7.0b3

file modified
+1 -1 
@@ -1,1 +1,1 @@ 
 

- SHA512 (Python-3.7.0b3.tar.xz) = 4fd605cb1621e4bed73c2aadf0443fb70b4d013e9d93a26e81e75dc56906062660b63ac1d97224da217d5e05a3372802a291924a26cc067959d8e1e753a8356f
 

+ SHA512 (Python-3.7.0b4.tar.xz) = e97459a5467a984a5a2bfc08ed937dfeb899f3d4ff9a655878badffc19e722efc30112422c14f94fcf9f6c82ee01e9fe2bb538db83454e4c83b711d1a8444472

no initial comment

3 new commits added

  • Bump the bundled pip version to 10.0.1
  • Rebase the rewheel patch
  • Only require python3-rpm-generators when built with rewheel
5 years ago

Pull-Request has been merged by churchyard
5 years ago
Changes Summary 5
+16 -7
file changed
00189-add-rewheel-module.patch
+21 -20
file changed
00274-fix-arch-names.patch
+13
file added
00304-test-posix-pass-environ.patch
+27 -6
file changed
python37.spec
+1 -1
file changed
sources
Powered by Pagure 5.13.3
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.