Skip to content
This repository has been archived by the owner on Jan 12, 2021. It is now read-only.

Commit

Permalink
Merge branch 'osx'
Browse files Browse the repository at this point in the history
  • Loading branch information
orsinium committed Apr 20, 2019
2 parents db5b33a + 4fa68b0 commit baa291f
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 4 deletions.
10 changes: 10 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,15 @@ matrix:
- python: "pypy3.5"
env: ENV=pytest

- os: osx
language: generic
env: ENV=pytest
before_install:
- /usr/local/bin/python3 install.py
- dephell inspect self
install:
- dephell venv create --env=$ENV --python=/usr/local/bin/python3 --level=DEBUG --traceback
- dephell deps install --env=$ENV --level=DEBUG --traceback

- python: "3.6"
env: ENV=flake8
4 changes: 3 additions & 1 deletion dephell/converters/poetry.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def loads(self, content) -> RootDependency:
value = tuple(value)
setattr(root, field, value)
if 'authors' in section:
root.authors = tuple(Author.parse(author) for author in section['authors'])
root.authors = tuple(Author.parse(str(author)) for author in section['authors'])
if 'readme' in section:
path = Path(section['readme'])
if path.exists():
Expand Down Expand Up @@ -165,6 +165,8 @@ def dumps(self, reqs, project: RootDependency, content=None) -> str:
for req in reqs:
if is_dev is req.is_dev:
section[section_name][req.name] = self._format_req(req=req)
if not section[section_name].value:
del section[section_name]

# extras
extras = defaultdict(list)
Expand Down
6 changes: 3 additions & 3 deletions tests/test_repositories/test_git_git.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Dep:
raw_name = 'DepHell'


@pytest.mark.skipif('TRAVIS_PYTHON_VERSION' in environ, reason='Travis CI has broken git repo')
@pytest.mark.skipif('TRAVIS_OS_NAME' in environ, reason='Travis CI has broken git repo')
def test_releases():
link = PatchedVCSLink(server=None, author=None, project=None, name='dephell')
repo = GitRepo(link)
Expand All @@ -35,7 +35,7 @@ def test_releases():
assert str(releases[1].version) == '0.1.5'


@pytest.mark.skipif('TRAVIS_PYTHON_VERSION' in environ, reason='Travis CI has broken git repo')
@pytest.mark.skipif('TRAVIS_OS_NAME' in environ, reason='Travis CI has broken git repo')
def test_deps():
link = PatchedVCSLink(server=None, author=None, project=None, name='dephell')
repo = GitRepo(link)
Expand All @@ -46,7 +46,7 @@ def test_deps():
assert set(dep.name for dep in deps) == {'attrs', 'cached-property', 'packaging', 'requests'}


@pytest.mark.skipif('TRAVIS_PYTHON_VERSION' in environ, reason='Travis CI has broken git repo')
@pytest.mark.skipif('TRAVIS_OS_NAME' in environ, reason='Travis CI has broken git repo')
def test_metaversion():
link = PatchedVCSLink(server=None, author=None, project=None, name='dephell')
repo = GitRepo(link)
Expand Down

0 comments on commit baa291f

Please sign in to comment.