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.

Sign up for GitHub

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

Jump to bottom

Fix python3 #1

Merged
merged 27 commits into from
Nov 28, 2014
Merged

Fix python3 #1

merged 27 commits into from
Nov 28, 2014

Conversation

mauricioabreu
Copy link

No description provided.

bfirsh and others added 27 commits October 23, 2014 18:28
@bfirsh
Add TL;DR section to CONTRIBUTING.md
28f9c8d 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
@bfirsh
Tidied up development environment instructions
ea45715 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
@bfirsh
Move building binaries instructions
899670f 
It's less important than signing your work.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
@bfirsh
Add .dockerignore
e66c045 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
@aanand
Merge pull request docker#580 from bfirsh/improve-contributing-instru…
a83876d 
…ctions

Improve contributing instructions
@aanand
Merge pull request docker#581 from bfirsh/add-dockerignore
11280e4 
Add .dockerignore
@kevinsimper
Update wordpress url on wordpress example
b47ab2b 
The old url gave a 302 and wordpress 4.0 has also been released.
@npeters
fix insecure parameter
b64ea85 
Signed-off-by: Nicolas Peters <peters.nico@gmail.com>
@aanand
Merge pull request docker#584 from kevinsimper/patch-1
1bd3d0d 
Update wordpress url on wordpress example
@kojiromike
Fixes docker#602 Allowing help $cmd with no figfile
782a46f 
Signed-off-by: Michael A. Smith <michael@smith-li.com>
@aanand
Merge pull request docker#606 from kojiromike/602-no-help-without-fig…
604b370 
…file

Fixes docker#602 Allowing `help $cmd` with no figfile
@aanand
Merge pull request docker#591 from npeters/fix-insecure-registry
cb275b8 
fix insecure parameter
@bfirsh
Use upstream dockerpty 0.3.2
38a3ee8 
This reverts commit 60411e9.

Closes docker#556

Signed-off-by: Ben Firshman <ben@firshman.co.uk>

Conflicts:
	requirements.txt
	setup.py
@bfirsh
Don't select stdin when interactive=False
8773f51 
Patch from d11wtq/dockerpty#24

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
@raulcd
Add signal in the kill CLI commando to send a specific signal to the …
9abdd33 
…service

Signed-off-by: Raúl Cumplido <raulcumplido@gmail.com>
@aanand
Merge pull request docker#588 from bfirsh/use-upstream-dockerpty
9260603 
Use upstream dockerpty 0.3.2
@bfirsh
Ship 1.0.1
46433c7 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
@bfirsh
Make @dnephin a maintainer
06a1b32 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
@aanand
Merge pull request docker#612 from bfirsh/ship-1.0.1
5dde2a2 
Ship 1.0.1
@aanand
Merge pull request docker#618 from bfirsh/make-dnephin-a-maintainer
3f4b161 
Make @dnephin a maintainer
@drewkett
Support multiple port mappings for same internal port
f98323b 
Signed-off-by: Andrew Burkett <burkett.andrew@gmail.com>
@drewkett
Move to build_port_bindings(). Added Tests
4f6d028 
Signed-off-by: Andrew Burkett <burkett.andrew@gmail.com>
@dnephin
Merge pull request docker#624 from drewkett/multiple_port_mappings
d3e94f2 
Support multiple port bindings for same internal port
@dnephin
Merge pull request docker#611 from raulcd/604_support_reloading_conta…
65ae22e 
…iners

Add signal in the kill CLI commando to send a specific signal to the service
@dnephin
Support python 3
ee03199 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
Fixing errors when using Python 3.x
12ee260 
Using six to keep the code compatible.
Updating except to the new format.
Merging conflict
89ae4d9 
Conflicts:
	tests/integration/cli_test.py
@mauricioabreu
Copy link
Author

Even with these fixes, I still get two errors like this one:

======================================================================
ERROR: test_run_without_command (tests.integration.cli_test.CLITestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python3.4/unittest/mock.py", line 1125, in patched
    return func(*args, **keywargs)
  File "/vagrant/tests/integration/cli_test.py", line 184, in test_run_without_command
    self.check_build('tests/fixtures/simple-dockerfile', tag='figtest_test')
  File "/vagrant/tests/integration/testcases.py", line 39, in check_build
    stream_output(build_output, open('/dev/null', 'w'))
  File "/vagrant/fig/progress_stream.py", line 19, in stream_output
    for chunk in output:
  File "/vagrant/.tox/py34/lib/python3.4/site-packages/docker/client.py", line 279, in _stream_helper
    socket_fp = socket_obj(_sock=self._get_raw_response_socket(response))
nose.proxy.TypeError: __init__() got an unexpected keyword argument '_sock'

I am curious if it is related to d11wtq/dockerpty#8

dnephin added a commit that referenced this pull request Nov 28, 2014
@dnephin
Merge pull request #1 from mauricioabreu/fix-python3
84e6d2f 
Fix python3
@dnephin dnephin merged commit 84e6d2f into dnephin:python3 Nov 28, 2014
dnephin added a commit that referenced this pull request Feb 6, 2015
@dnephin
Merge pull request #1 from dnephin/replace_packages_with_deps
1db949f 
Replace packages with deps
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@mauricioabreu @dnephin @bfirsh @aanand @kevinsimper @npeters @kojiromike @raulcd @drewkett