Git Merge Request #318: Upgrade cryptography and decorator version. (rejected)

Merging...

Merged

Something went wrong. Please, merge manually

Checking if merge is possible...

Something went wrong. Please, merge manually

Abhishek Chaudhary wants to merge 2 commits from /u/abhishek/abhi-allura/ to master, 2020-04-10

Decorator dependancy has been updated to version 4.3.2 and Cryptography dependancy to version 2.0.

Commit Date  
[950062] (crypto-deco-dep) by Abhishekism9450 Abhishekism9450

Upgrade cryptography and decorator version

2019-03-15 10:47:46 Tree
[7083cf] by Abhishekism9450 Abhishekism9450

Change BeautifulSoup to BeautifulSoup4

2019-03-08 16:58:40 Tree

Discussion

  • Dave Brondsema

    Dave Brondsema - 2019-03-15

    Hi Abhishek,

    These look like simpler changes than beautiful soup :D However this branch has 2 commits and both still have beautifulsoup related stuff in them. If you branch off of origin/master you can get a clean start without the beautifulsoup changes.

    On my development machine, I have some optional packages installed. One of them "newrelic" let this test run instead of skip, and it has an issue. You should be able to install newrelic, see the test fail, and then see what decorator changes are necessary to fix it.

    ======================================================================
    ERROR: allura.tests.functional.test_root.TestRootController.test_newrelic_set_transaction_name
    ----------------------------------------------------------------------
    Traceback (most recent call last):
      File "/var/local/env-allura/lib/python2.7/site-packages/nose-1.3.4-py2.7.egg/nose/case.py", line 197, in runTest
        self.test(*self.arg)
      File "/var/local/env-allura/lib/python2.7/site-packages/ipython-1.2.1-py2.7.egg/IPython/testing/decorators.py", line 232, in skipper_func
        return f(*args, **kwargs)
      File "/src/allura/Allura/allura/tests/functional/test_root.py", line 172, in test_newrelic_set_transaction_name
        assert_equal(arg.undecorated,
    AttributeError: 'function' object has no attribute 'undecorated'
    

    For the cryptography changes, why not upgrade all the way to the latest 2.6.1? Also we include further dependencies in our requirements file, and when I installed a newer cryptography I saw asn1crypto get installed, so that should be added. (And pyasn1 might be able to be removed)

     
  • Abhishek Chaudhary

    Hello Dave, I have upgraded to the latest version of cryptography and have also upgraded WebOb in a seprate merge request.
    For the "newrelic" i am working on the error. Soon will notify you.
    Have a look on the merge request for another dependancy.

     
  • Dave Brondsema

    Dave Brondsema - 2020-04-10
    • Status: open --> rejected
     

Log in to post a comment.