Instead of modifying the .gitattributes file, you could try adding it to .git/info/attributes which is local to your repository.
[email protected] schrieb am Samstag, 12. Februar 2022 um 01:37:40 UTC+1: > Something that has come up a few times when doing these upgrades for me > has been line endings causing git to think a file has changed which makes > merging things cleaning a major PITA. I believe this is caused by #31306, > and what I have to do is add this line to .gitattributes > > *.png binary > > and bring that with me (i.e., not doing a commit) as I merge in develop to > my local branches (rebasing is even harder because I have to actually make > it a commit and then revert it). > > I tried changing the auto crlf option, but that did not get me anywhere. I > don't know if anything can be done about this, but it would be nice if > there was something. > > Best, > Travis > > On Wednesday, February 9, 2022 at 10:04:34 PM UTC+9 [email protected] > wrote: > >> On Debian testing running on core i5 + 8 GB RAM, upgrading 9.5 to >> 9.6.beta0 and running ptestlong gets me three permanent failures. >> >> Already reported : >> >> sage -t --long --warn-long 71.7 >> --random-seed=230319547821274793169446791358036431034 >> src/sage/algebras/quantum_groups/quantum_group_gap.py # 1 doctest failed >> sage -t --long --warn-long 71.7 >> --random-seed=230319547821274793169446791358036431034 >> src/sage/functions/min_max.py # 2 doctests failed >> >> New (with rerun) : >> >> charpent@p-202-021:/usr/local/sage-9$ sage -t --long --warn-long 71.7 >> --random-seed=230319547821274793169446791358036431034 >> src/sage/schemes/toric/sheaf/klyachko.py # 1 doctest failed >> Running doctests with ID 2022-02-09-13-57-32-1e45e852. >> Git branch: develop >> Using >> --optional=debian,debugpy,dot2tex,fricas,gap_packages,libsemigroups,pip,sage,sage_spkg >> Features to be detected: >> 4ti2,benzene,bliss,buckygen,conway_polynomials,csdp,database_cremona_ellcurve,database_cremona_mini_ellcurve,database_jones_numfield,database_knotinfo,dvipng,graphviz,imagemagick,jupymake,kenzo,latte_int,lrslib,mcqd,meataxe,pandoc,pdf2svg,plantri,pynormaliz,python_igraph,rubiks,sage.combinat,sage.geometry.polyhedron,sage.graphs,sage.groups,sage.plot,sage.rings.number_field,sage.rings.padics,sage.rings.real_double,sage.symbolic,sage_numerical_backends_coin,sagemath_doc_html,sphinx,tdlib >> Doctesting 1 file. >> sage -t --long --warn-long 71.7 >> --random-seed=230319547821274793169446791358036431034 >> src/sage/schemes/toric/sheaf/klyachko.py >> ********************************************************************** >> File "src/sage/schemes/toric/sheaf/klyachko.py", line 950, in >> sage.schemes.toric.sheaf.klyachko.KlyachkoBundle_class.random_deformation >> Failed example: >> Vtilde.cohomology(dim=True, weight=(0,)) >> Expected: >> (1, 0) >> Got: >> (0, 0) >> ********************************************************************** >> 1 item had failures: >> 1 of 7 in >> sage.schemes.toric.sheaf.klyachko.KlyachkoBundle_class.random_deformation >> [151 tests, 1 failure, 8.10 s] >> ---------------------------------------------------------------------- >> sage -t --long --warn-long 71.7 >> --random-seed=230319547821274793169446791358036431034 >> src/sage/schemes/toric/sheaf/klyachko.py # 1 doctest failed >> ---------------------------------------------------------------------- >> Total time for all tests: 8.2 seconds >> cpu time: 7.7 seconds >> cumulative wall time: 8.1 seconds >> Features detected for doctesting: >> Pytest is not installed, skip checking tests that rely on it. >> >> HTH, >> >> Le dimanche 6 février 2022 à 20:14:02 UTC+1, Volker Braun a écrit : >> >>> As always, you can get the latest beta version from the "develop" git >>> branch. Alternatively, the self-contained source tarball is at >>> http://www.sagemath.org/download-latest.html >>> >>> There is a new random failure that I spent a lot of time unsuccessfully >>> to isolate, currently I can't reproduce it with this release but if you >>> observe it please report. It might be related to the cython update, not >>> sure: >>> >>> File "src/sage/schemes/cyclic_covers/cycliccover_finite_field.py", line >>> 1138, in >>> sage.schemes.cyclic_covers.cycliccover_finite_field.CyclicCover_finite_field.frobenius_polynomial >>> Failed example: >>> CyclicCover(11, PolynomialRing(GF(1129), 'x')([-1] + [0]*(5-1) + >>> [1])).frobenius_polynomial() # long time >>> Exception raised: >>> Traceback (most recent call last): >>> File "sage/misc/cachefunc.pyx", line 1943, in >>> sage.misc.cachefunc.CachedMethodCaller.__call__ >>> (build/cythonized/sage/misc/cachefunc.c:10410) >>> return cache[k] >>> KeyError: ((11,), ()) >>> During handling of the above exception, another exception occurred: >>> Traceback (most recent call last): >>> File >>> "/Users/buildbot-sage/worker/sage_git/build/local/var/lib/sage/venv-python3.9.9/lib/python3.9/site-packages/sage/doctest/forker.py", >>> >>> line 694, in _run >>> self.compile_and_execute(example, compiler, test.globs) >>> File >>> "/Users/buildbot-sage/worker/sage_git/build/local/var/lib/sage/venv-python3.9.9/lib/python3.9/site-packages/sage/doctest/forker.py", >>> >>> line 1088, in compile_and_execute >>> exec(compiled, globs) >>> File "<doctest >>> sage.schemes.cyclic_covers.cycliccover_finite_field.CyclicCover_finite_field.frobenius_polynomial[23]>", >>> >>> line 1, in <module> >>> CyclicCover(Integer(11), PolynomialRing(GF(Integer(1129)), >>> 'x')([-Integer(1)] + [Integer(0)]*(Integer(5)-Integer(1)) + >>> [Integer(1)])).frobenius_polynomial() # long time >>> File "sage/misc/cachefunc.pyx", line 2310, in >>> sage.misc.cachefunc.CachedMethodCallerNoArgs.__call__ >>> (build/cythonized/sage/misc/cachefunc.c:13020) >>> self.cache = f(self._instance) >>> File >>> "/Users/buildbot-sage/worker/sage_git/build/local/var/lib/sage/venv-python3.9.9/lib/python3.9/site-packages/sage/schemes/cyclic_covers/cycliccover_finite_field.py", >>> >>> line 1233, in frobenius_polynomial >>> F = self.frobenius_matrix(self._N0) >>> File "sage/misc/cachefunc.pyx", line 1948, in >>> sage.misc.cachefunc.CachedMethodCaller.__call__ >>> (build/cythonized/sage/misc/cachefunc.c:10546) >>> w = self._instance_call(*args, **kwds) >>> File "sage/misc/cachefunc.pyx", line 1824, in >>> sage.misc.cachefunc.CachedMethodCaller._instance_call >>> (build/cythonized/sage/misc/cachefunc.c:10012) >>> >>> >>> The following tickets were merged: >>> >>> 226937dfa9 (HEAD -> develop, tag: 9.6.beta0, trac/develop) Updated >>> SageMath version to 9.6.beta0 >>> f0df3d8b40 (origin/develop) Trac #32985: cython: Update to 0.29.25 >>> 3984fd1484 Trac #32984: fix _row_ambient_module/_column_ambient_module >>> and make them public >>> 721769c1cf Trac #32979: minor details in combinat >>> 71337f9807 Trac #32978: fix usage of underscore in combinat loops >>> 4e5971f12b Trac #32970: fix parent of 0th Bernoulli polynomial >>> 2d74bd412d Trac #32968: Update sphinx to 4.3 >>> 50d9be9690 Trac #32891: Unstable doctest >>> geometry/hyperbolic_space/hyperbolic_model.py >>> 65aef17f4d Trac #32890: Unstable doctest in hmm/chmm.pyx >>> 41d49e33d5 Trac #32888: Feature for sage.groups >>> dcce1d6f5e Trac #32881: Feature for sage.rings.padics >>> b36016a2fb Trac #32877: Remove superfluous set_random_seed() calls >>> c85d2304d9 Trac #32873: sage.features, sage_setup: Replace use of >>> distutils.errors by setuptools >>> 86d4d9702f Trac #32856: Get rid of "# optional - build" >>> 6008371eba Trac #32846: sage.geometry: More # optional >>> ea39266e7e Trac #32802: Clean the use of weights in graph.py >>> 9b45db5d82 Trac #32798: Clean the use of weights in generic_graph.py - >>> part 1 >>> 06f45f2916 Trac #32726: quaternion ideals' .scale() incorrectly copies >>> cached left and right orders >>> 468797ca2d Trac #32683: LP Bounds for Johnson Scheme, Q-Polynomial >>> Association Schemes >>> ac5c815531 Trac #32553: Fix coefficient method for modular forms >>> 593b6ae930 Trac #32510: Update igraph to 0.9.5 and python_igraph to 0.9.8 >>> d4abc0a852 Trac #32451: asymptotic expansions: improve >>> compare_with_values(), including support for interval coefficients >>> 742c77c14b Trac #32252: fix colours of tiles in TilingSolver >>> 971737e7d5 Trac #31787: Alternative parameters for generating a >>> k-regular sequence from recurrence relations >>> 648007030e Trac #31424: wrong result for bool(a <= b) >>> ddf44d8b49 Trac #31306: sage.repl: Replace use of SAGE_EXTCODE by >>> importlib.resources >>> d04fbee6cb Trac #31299: Chu-Vandermonde simplification fails >>> 3abe1a7938 Trac #31013: Remove unused class from sage_setup.optional >>> extension >>> 464f81e388 Trac #30362: Add symplectic structures >>> 25080fa1b3 Trac #29865: Modularization of sagelib: Break out separate >>> packages sagemath-objects, sagemath-categories >>> 7483aad48a Trac #25633: Speed up SBox module >>> 494fbe35fc Trac #21325: k-regular sequences: subsequences, >>> forward/backward difference, partial sums >>> 3b35941b3b Trac #33189: Make tests pass with arb 2.22 >>> 201888456d Trac #33173: Off-by-one error in CFiniteSequence slices >>> 2e10636c98 Trac #33131: Installation manual: Add decision tree, remove >>> mention of Sage-mirror-hosted binary distributions >>> 6f5f31e10e Trac #33101: lrslib: fix doctest in game_theory/parser.py >>> b8c7f43ec6 Trac #33077: pari-jupyter: Reinstate >>> 0222526fb8 Trac #8450: intermediate complex expression in real functions >>> make many plot functions fail >>> 439907fd9a (tag: 9.5, trac/master, origin/master, origin/HEAD) Updated >>> SageMath version to 9.5 >>> >> -- You received this message because you are subscribed to the Google Groups "sage-release" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/sage-release/d52976f2-e453-4aaf-b180-d128bd47f9f8n%40googlegroups.com.
