Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge sciencelogic/flask-casbin to casbin/flask-authz #6

Merged
merged 36 commits into from Jul 1, 2020

Conversation

jessecooper
Copy link
Collaborator

@jessecooper jessecooper commented Jun 30, 2020

Github Conversation Reference: daymien/Flask-Casbin#1

jessecooper and others added 30 commits September 13, 2019 08:00
* auth_docoder: add support for basic auth decoding to get the owner from the token
…her to master

* commit 'f520ddd835f26b6f30a77e8a1bc6d11809f4f625':
  increment version
  more keywords in setup.py
  watcher ABC importable from init
  abc update and unit tests
  author and author email updates
  use abc for watcher interface
  set_watcher method to keep encapsulation
  support automatically reloading casbin roles via watcher service if it exists
  support watcher arg in flask_casbin
@jessecooper
Copy link
Collaborator Author

Build issue appears to be Travis env related. I will add tox and see if that clears it up.

@hsluoyz
Copy link
Member

hsluoyz commented Jul 1, 2020

@jessecooper can you fix the Travis error?

resolvconf
git.checkout

0.62s$ git clone --depth=50 https://github.com/pycasbin/flask-authz.git pycasbin/flask-authz

0.01s0.01s$ source ~/virtualenv/python3.7/bin/activate

$ python --version

Python 3.7.1

$ pip --version

pip 19.0.3 from /home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages/pip (python 3.7)
install.1

2.63s$ pip install -r requirements.txt
install.2

19.24s$ pip install -r dev_requirements.txt
install.3

1.36s$ pip install coveralls

0.35s$ pytest --cov

Traceback (most recent call last):

  File "/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages/pluggy/manager.py", line 267, in load_setuptools_entrypoints

    plugin = ep.load()

  File "/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages/pkg_resources/__init__.py", line 2410, in load

    self.require(*args, **kwargs)

  File "/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages/pkg_resources/__init__.py", line 2433, in require

    items = working_set.resolve(reqs, env, installer, extras=self.extras)

  File "/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages/pkg_resources/__init__.py", line 791, in resolve

    raise VersionConflict(dist, req).with_context(dependent_req)

pkg_resources.VersionConflict: (pytest 4.3.1 (/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages), Requirement.parse('pytest>=4.6'))

@hsluoyz
Copy link
Member

hsluoyz commented Jul 1, 2020

lgtm

@hsluoyz hsluoyz merged commit 84eb480 into pycasbin:master Jul 1, 2020
@jessecooper jessecooper deleted the sl-flask-casbin-to-flask-authz branch July 1, 2020 17:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants