diff options
| author | Kenneth Reitz <me@kennethreitz.com> | 2014-01-08 13:53:23 -0500 |
|---|---|---|
| committer | Kenneth Reitz <me@kennethreitz.com> | 2014-01-08 13:53:23 -0500 |
| commit | df1c2335c82165b961b8a0361d0176cdb298e513 (patch) | |
| tree | 7fcf397321be4a85ad4a757751568a4082b02305 /Makefile | |
| parent | 1500632b602be698bfce682daeb01a2d64fc2d39 (diff) | |
| parent | b17cad65cf27646f0680954914ab31abd4f626c9 (diff) | |
| download | python-requests-fix-pickling-adapters.tar.gz | |
Merge branch 'master' into fix-pickling-adaptersfix-pickling-adapters
Conflicts:
AUTHORS.rst
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -15,7 +15,7 @@ ci: init certs: curl http://ci.kennethreitz.org/job/ca-bundle/lastSuccessfulBuild/artifact/cacerts.pem -o requests/cacert.pem -deps: urllib3 charade +deps: urllib3 chardet urllib3: rm -fr requests/packages/urllib3 @@ -23,13 +23,14 @@ urllib3: mv urllib3/urllib3 requests/packages/ rm -fr urllib3 -charade: - rm -fr requests/packages/charade - git clone https://github.com/sigmavirus24/charade.git - mv charade/charade requests/packages/ - rm -fr charade +chardet: + rm -fr requests/packages/chardet + git clone https://github.com/chardet/chardet.git + mv chardet/chardet requests/packages/ + rm -fr chardet publish: + python setup.py register python setup.py sdist upload python setup.py bdist_wheel upload |