version 1.2.10
This commit is contained in:
		
							parent
							
								
									f3c22bd312
								
							
						
					
					
						commit
						ea553bae72
					
				
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @ -60,3 +60,4 @@ SQLAlchemy-0.6.1.tar.gz | |||||||
| /SQLAlchemy-1.2.6.tar.gz | /SQLAlchemy-1.2.6.tar.gz | ||||||
| /SQLAlchemy-1.2.7.tar.gz | /SQLAlchemy-1.2.7.tar.gz | ||||||
| /SQLAlchemy-1.2.8.tar.gz | /SQLAlchemy-1.2.8.tar.gz | ||||||
|  | /SQLAlchemy-1.2.10.tar.gz | ||||||
|  | |||||||
| @ -1,56 +0,0 @@ | |||||||
| diff --git a/lib/sqlalchemy/util/langhelpers.py b/lib/sqlalchemy/util/langhelpers.py
 |  | ||||||
| index 213f3a0..1518d2b 100644
 |  | ||||||
| --- a/lib/sqlalchemy/util/langhelpers.py
 |  | ||||||
| +++ b/lib/sqlalchemy/util/langhelpers.py
 |  | ||||||
| @@ -371,7 +371,9 @@ def format_argspec_plus(fn, grouped=True):
 |  | ||||||
|      else: |  | ||||||
|          # we accept an existing argspec... |  | ||||||
|          spec = fn |  | ||||||
| -    args = inspect.formatargspec(*spec)
 |  | ||||||
| +    with warnings.catch_warnings():
 |  | ||||||
| +        warnings.filterwarnings("ignore", category=DeprecationWarning)
 |  | ||||||
| +        args = inspect.formatargspec(*spec)
 |  | ||||||
|      if spec[0]: |  | ||||||
|          self_arg = spec[0][0] |  | ||||||
|      elif spec[1]: |  | ||||||
| @@ -380,8 +382,10 @@ def format_argspec_plus(fn, grouped=True):
 |  | ||||||
|          self_arg = None |  | ||||||
|   |  | ||||||
|      if compat.py3k: |  | ||||||
| -        apply_pos = inspect.formatargspec(spec[0], spec[1],
 |  | ||||||
| -                                          spec[2], None, spec[4])
 |  | ||||||
| +        with warnings.catch_warnings():
 |  | ||||||
| +            warnings.filterwarnings("ignore", category=DeprecationWarning)
 |  | ||||||
| +            apply_pos = inspect.formatargspec(spec[0], spec[1],
 |  | ||||||
| +                                              spec[2], None, spec[4])
 |  | ||||||
|          num_defaults = 0 |  | ||||||
|          if spec[3]: |  | ||||||
|              num_defaults += len(spec[3]) |  | ||||||
| @@ -400,9 +404,11 @@ def format_argspec_plus(fn, grouped=True):
 |  | ||||||
|      else: |  | ||||||
|          defaulted_vals = () |  | ||||||
|   |  | ||||||
| -    apply_kw = inspect.formatargspec(name_args, spec[1], spec[2],
 |  | ||||||
| -                                     defaulted_vals,
 |  | ||||||
| -                                     formatvalue=lambda x: '=' + x)
 |  | ||||||
| +    with warnings.catch_warnings():
 |  | ||||||
| +        warnings.filterwarnings("ignore", category=DeprecationWarning)
 |  | ||||||
| +        apply_kw = inspect.formatargspec(name_args, spec[1], spec[2],
 |  | ||||||
| +                                         defaulted_vals,
 |  | ||||||
| +                                         formatvalue=lambda x: '=' + x)
 |  | ||||||
|      if grouped: |  | ||||||
|          return dict(args=args, self_arg=self_arg, |  | ||||||
|                      apply_pos=apply_pos, apply_kw=apply_kw) |  | ||||||
| @@ -646,8 +652,10 @@ def monkeypatch_proxied_specials(into_cls, from_cls, skip=None, only=None,
 |  | ||||||
|              continue |  | ||||||
|          try: |  | ||||||
|              spec = compat.inspect_getargspec(fn) |  | ||||||
| -            fn_args = inspect.formatargspec(spec[0])
 |  | ||||||
| -            d_args = inspect.formatargspec(spec[0][1:])
 |  | ||||||
| +            with warnings.catch_warnings():
 |  | ||||||
| +                warnings.filterwarnings("ignore", category=DeprecationWarning)
 |  | ||||||
| +                fn_args = inspect.formatargspec(spec[0])
 |  | ||||||
| +                d_args = inspect.formatargspec(spec[0][1:])
 |  | ||||||
|          except TypeError: |  | ||||||
|              fn_args = '(self, *args, **kw)' |  | ||||||
|              d_args = '(*args, **kw)' |  | ||||||
| @ -1,28 +0,0 @@ | |||||||
| From 3fd3ac6d554019f54efe1935f3a25cb5939fdad3 Mon Sep 17 00:00:00 2001 |  | ||||||
| From: Nils Philippsen <nils@tiptoe.de> |  | ||||||
| Date: Mon, 18 Jun 2018 00:08:38 +0200 |  | ||||||
| Subject: [PATCH] fix TypeReflectionTest for sqlite 3.24 |  | ||||||
| 
 |  | ||||||
| SQLite 3.24 added support for PostgreSQL-style UPSERT. This added two |  | ||||||
| new keywords 'DO' and 'NOTHING' which made |  | ||||||
| test_round_trip_direct_type_affinity() fail with a syntax error. |  | ||||||
| ---
 |  | ||||||
|  test/dialect/test_sqlite.py | 2 +- |  | ||||||
|  1 file changed, 1 insertion(+), 1 deletion(-) |  | ||||||
| 
 |  | ||||||
| diff --git a/test/dialect/test_sqlite.py b/test/dialect/test_sqlite.py
 |  | ||||||
| index 4c462aed1..d2d563208 100644
 |  | ||||||
| --- a/test/dialect/test_sqlite.py
 |  | ||||||
| +++ b/test/dialect/test_sqlite.py
 |  | ||||||
| @@ -1637,7 +1637,7 @@ class TypeReflectionTest(fixtures.TestBase):
 |  | ||||||
|              ("BLOBBER", sqltypes.NullType()), |  | ||||||
|              ("DOUBLE PRECISION", sqltypes.REAL()), |  | ||||||
|              ("FLOATY", sqltypes.REAL()), |  | ||||||
| -            ("NOTHING WE KNOW", sqltypes.NUMERIC()),
 |  | ||||||
| +            ("SOMETHING UNKNOWN", sqltypes.NUMERIC()),
 |  | ||||||
|          ] |  | ||||||
|   |  | ||||||
|      def _fixture_as_string(self, fixture): |  | ||||||
| -- 
 |  | ||||||
| 2.17.1 |  | ||||||
| 
 |  | ||||||
| @ -5,8 +5,8 @@ | |||||||
| %global srcname SQLAlchemy | %global srcname SQLAlchemy | ||||||
| 
 | 
 | ||||||
| Name:           python-sqlalchemy | Name:           python-sqlalchemy | ||||||
| Version:        1.2.8 | Version:        1.2.10 | ||||||
| Release:        4%{?dist} | Release:        1%{?dist} | ||||||
| Summary:        Modular and flexible ORM library for python | Summary:        Modular and flexible ORM library for python | ||||||
| 
 | 
 | ||||||
| Group:          Development/Libraries | Group:          Development/Libraries | ||||||
| @ -14,14 +14,6 @@ License:        MIT | |||||||
| URL:            http://www.sqlalchemy.org/ | URL:            http://www.sqlalchemy.org/ | ||||||
| Source0:        https://files.pythonhosted.org/packages/source/S/%{srcname}/%{srcname}-%{version}.tar.gz | Source0:        https://files.pythonhosted.org/packages/source/S/%{srcname}/%{srcname}-%{version}.tar.gz | ||||||
| 
 | 
 | ||||||
| # There are DeprecationWarnings that prevent the tests from running on Python |  | ||||||
| # 3.7 Those should be fixed upstream, we ignore them instead |  | ||||||
| Patch0:         python-sqlalchemy-1.2.8-ignore-DeprecationWarning.patch |  | ||||||
| 
 |  | ||||||
| # Fix tests for sqlite 3.24 |  | ||||||
| # https://github.com/zzzeek/sqlalchemy/pull/452 |  | ||||||
| Patch1:         python-sqlalchemy-1.2.8-sqlite-3.24.patch |  | ||||||
| 
 |  | ||||||
| BuildRequires:  gcc | BuildRequires:  gcc | ||||||
| 
 | 
 | ||||||
| BuildRequires:  python2-devel >= 2.6 | BuildRequires:  python2-devel >= 2.6 | ||||||
| @ -93,9 +85,6 @@ This package includes the python 3 version of the module. | |||||||
| %prep | %prep | ||||||
| %setup -n %{srcname}-%{version} | %setup -n %{srcname}-%{version} | ||||||
| 
 | 
 | ||||||
| %patch0 -p1 -b .ignore-DeprecationWarning |  | ||||||
| %patch1 -p1 -b .sqlite-3.24 |  | ||||||
| 
 |  | ||||||
| %build | %build | ||||||
| %py2_build | %py2_build | ||||||
| 
 | 
 | ||||||
| @ -137,6 +126,9 @@ PYTHONPATH=. %{__python3} -m pytest test | |||||||
| %endif # with_python3 | %endif # with_python3 | ||||||
| 
 | 
 | ||||||
| %changelog | %changelog | ||||||
|  | * Sun Jul 22 2018 Nils Philippsen <nils@tiptoe.de> - 1.2.10-1 | ||||||
|  | - version 1.2.10 | ||||||
|  | 
 | ||||||
| * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.8-4 | * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.8-4 | ||||||
| - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild | - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild | ||||||
| 
 | 
 | ||||||
|  | |||||||
							
								
								
									
										2
									
								
								sources
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								sources
									
									
									
									
									
								
							| @ -1 +1 @@ | |||||||
| SHA512 (SQLAlchemy-1.2.8.tar.gz) = 07af161586ac0a9a44e8dff3a65b0433d41ccac89e0b4e2e7d9427c42dcdcca19c31805f81cad242e017e21557b2ff95d0c9e9e2e2339446bd75d0b415fafaf0 | SHA512 (SQLAlchemy-1.2.10.tar.gz) = d5684877c85cd85a117bf5ab3afdee8d810839fa903d84cc802678f48bd9f58d3975b60b96cdc5d598f3127f66a0fbc4463a826a5877698e6ba97f10d98b8726 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user