Skip to content

Added tox.ini and improved travis.yml #436

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

Merged
merged 1 commit into from
Jun 9, 2019

Conversation

ZuluPro
Copy link
Contributor

@ZuluPro ZuluPro commented May 6, 2018

I added a tox file to ease test across Python & Django versions.
I also improved the travis file to use the tox configuration.

@ZuluPro ZuluPro force-pushed the tox branch 4 times, most recently from a406832 to fe39fe1 Compare May 7, 2018 00:35
@coveralls
Copy link

coveralls commented May 7, 2018

Coverage Status

Coverage remained the same at 92.718% when pulling cb9eed6 on cloudspectatordevelopment:tox into b0cba39 on graphql-python:master.

@ZuluPro
Copy link
Contributor Author

ZuluPro commented May 14, 2018

@sciyoshi Any news ?

1 similar comment
@ZuluPro
Copy link
Contributor Author

ZuluPro commented May 20, 2018

@sciyoshi Any news ?

@sciyoshi
Copy link
Contributor

Looks fine to me, but I don't have commit access. Please ask @syrusakbary or @jm2242 to review + merge.

@jm2242
Copy link
Contributor

jm2242 commented May 22, 2018

I'm happy to take a look but I'm not sure I'm involved in the project enough to have a say!

@firaskafri
Copy link
Collaborator

@ZuluPro Interested to update this pull request?

Copy link
Collaborator

@zbyte64 zbyte64 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tests seem to only fail for Django < 1.10 ; which we don't currently test. We should go ahead and disable those environments.

@ZuluPro ZuluPro force-pushed the tox branch 3 times, most recently from d2d5c00 to db40940 Compare March 31, 2019 01:15
@ZuluPro
Copy link
Contributor Author

ZuluPro commented Mar 31, 2019

Hello @firaskafri @zbyte64

I updated my PR, removed <Django 1.10

@firaskafri firaskafri requested a review from zbyte64 March 31, 2019 15:31
Copy link
Collaborator

@zbyte64 zbyte64 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for this PR

@firaskafri firaskafri requested a review from jkimbo April 2, 2019 19:39
@phalt
Copy link
Contributor

phalt commented May 3, 2019

I'd like to tidy up some of the PRs, so if we still want to work on this let me know or I will close this in 1 week.

@dulmandakh
Copy link
Contributor

dulmandakh commented May 21, 2019

LGTM. @ZuluPro could you please remove 1.10 and 2.0 as these are not supported anymore. Also resolve the conflict.

@phalt
Copy link
Contributor

phalt commented May 21, 2019

Please resolve conflicts

Updated Travis YML
@ZuluPro
Copy link
Contributor Author

ZuluPro commented May 22, 2019

@phalt @zbyte64 : Rebased !

Note:
Django master's tests are failing due to a six import:

File "/home/travis/build/graphql-python/graphene-django/graphene_django/settings.py", line 18, in <module>
    from django.utils import six
ImportError: cannot import name 'six' from 'django.utils' (/home/travis/build/graphql-python/graphene-django/.tox/py3.7-djangomaster/lib/python3.7/site-packages/django/utils/__init__.py)```

@dulmandakh
Copy link
Contributor

@ZuluPro @phalt I think we need to add six as dependency and import it directly, rather than from Django.

Copy link
Contributor

@dulmandakh dulmandakh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@phalt let's merge this, and fix django master failure in another PR.

@mvanlonden mvanlonden merged commit 83cc0d7 into graphql-python:master Jun 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants