#2 Drop build dependency on flake8
Merged 2 years ago by churchyard. Opened 2 years ago by lbalhar.
rpms/ lbalhar/python-theano master  into  master

@@ -1,25 +0,0 @@ 

- --- setup.cfg.orig	2019-01-15 14:13:57.000000000 -0700

- +++ setup.cfg	2019-07-31 12:47:02.773919614 -0600

- @@ -3,7 +3,7 @@ match=^test

-  nocapture=1

-  

-  [flake8]

- -ignore=E501,E123,E133,FI12,FI14,FI15,FI50,FI51,FI53

- +ignore=E117,E123,E133,E305,E501,E741,E742,FI12,FI14,FI15,FI50,FI51,FI53,F401,F403,F405,F632,F811,F821,F841,W504,W605

-  

-  [versioneer]

-  VCS = git

- --- theano/tests/test_flake8.py.orig	2019-01-15 14:13:57.000000000 -0700

- +++ theano/tests/test_flake8.py	2019-07-31 12:50:31.347642299 -0600

- @@ -37,8 +37,9 @@ __contact__ = "Saizheng Zhang <saizhengl

-  # - "expected 2 blank lines after class or function definition"' (E305)

-  # - "ambiguous variable name" (E741)

-  #   Redundant error code generated by flake8-future-import module

- -ignore = ('E501', 'E123', 'E133', 'FI12', 'FI14', 'FI15', 'FI16', 'FI17',

- -          'FI50', 'FI51', 'FI53', 'E305', 'E741')

- +ignore = ('E117', 'E123', 'E133', 'E305', 'E501', 'E741', 'E742', 'FI12',

- +          'FI14', 'FI15', 'FI16', 'FI17', 'FI50', 'FI51', 'FI53', 'F401',

- +          'F403', 'F405', 'F632', 'F811', 'F821', 'F841', 'W504', 'W605')

-  

-  whitelist_flake8 = [

-      "__init__.py",

file modified
+3 -3
@@ -16,8 +16,6 @@ 

  

  # Fix the blas interface; see https://github.com/Theano/Theano/issues/6518

  Patch0:         %{name}-blas.patch

- # Skip new flake8 tests that the code does not pass

- Patch1:         %{name}-flake8.patch

  # Adapt to sphinx 3

  Patch2:         %{name}-sphinx3.patch

  # Fix FutureWarnings from numpy.  Upstream commits:
@@ -74,7 +72,6 @@ 

  BuildRequires:  python3-devel

  BuildRequires:  python3-pygpu-devel

  BuildRequires:  python3dist(cython)

- BuildRequires:  python3dist(flake8)

  BuildRequires:  python3dist(nose)

  BuildRequires:  python3dist(numpy)

  BuildRequires:  python3dist(parameterized)
@@ -138,6 +135,9 @@ 

  # We don't have a git checkout, so don't invoke git to find the commit

  sed -i 's/@@tag@@/%{commit}/' doc/conf.py

  

+ # Remove linter test

+ rm theano/tests/test_flake8.py

+ 

  %build

  # Regenerate the Cython files, and fix the numpy interfaces

  cython -3 -o theano/scan_module/c_code/scan_perform.c \

Details in https://bugzilla.redhat.com/show_bug.cgi?id=1797982 Mock build passed.

Scratch build in progress: https://koji.fedoraproject.org/koji/taskinfo?taskID=45056855

Do not build this package after merge, we will do it in python 3.9 side tag.

simple-koji-ci build failed with a segfault. but the manual scratch build and https://copr.fedorainfracloud.org/coprs/g/python/python3.9/builds/?dirname=python3.9:pr:2 is a success. diff looks good

Pull-Request has been merged by churchyard

2 years ago