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

PyPI Release #64

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

PyPI Release #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8ac7b5
chore(travis): Update travis config for boto fix
Feb 18, 2019
9292a6b
Prepare 1.2.2 for PyPI release
fantix Feb 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ parts/
sdist/
var/
venv/
.python-version
*.egg-info/
.installed.cfg
*.egg
Expand Down Expand Up @@ -60,4 +61,4 @@ target/
.vscode/

# Databases
*.sq3
*.sq3
17 changes: 13 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
language: python
python:
- "2.7"
- '2.7'
install:
- python setup.py install
- pip install -r dev-requirements.txt -r requirements.txt
script: "py.test -v"
- export BOTO_CONFIG=/dev/null
- python setup.py install
- pip install -r dev-requirements.txt -r requirements.txt
script: py.test -v
deploy:
provider: pypi
user: uc-ctds
skip_existing: true
on:
tags: true
password:
secure: SiXrvvIt2vRDiCBCJ2GztxSOnLdr9LZoT3xnZdH7587mEuVKPT1GhwZxS9GZKpfHlNQTi3I38cgC/P82tH+inJvjYSIfXc46Nhy6GyEWv289O+PGDnlMpsm/4dyjLw7CTgw6F7goyhvrznF0SnikMwXOIilD6BsEzx4pWDBgDc3FfMXNf2rxGcZOaIg9hwVRsWuSiXtiawZPpYoHKkyVr3vlL1lQFd4dD474ChyyvS1rSWoMwAZkyMopvSlAk9QNnwE//P5CyUttGPlxSjN7KEoCHCqdxDIFOJe9BAbNOSPkEwZI8JRhm8puN0M8JAfYJMFWJ0oCFkmghoaFMCzUXj0xYqS31tobtCSl5HtfSPXuF6Dw+YtCZwDvYR35OrlJalKp9/OavEpIOnPA17OXWn2JyDlWjSiRgHn0X5irEHDtR1yW84GHy3D18C8jgOsbGygro6eQspx33H5PonEV42nvcW+o0Nsty/mNZaBNnfXO9+Xe/Xoa297pjshGvT4QKWbJgNeuuaHWItKFFImfgDlEiekusZnIrRDhc2S0GOddIqCtx+ibGOKlIGR8kYXa0ewv6HYFgTs0EUpwY057h9SKXieoeKIGHPmo6tPgbGrHb+zkbQb6ksrln/YssajcGAiOxkIJRtaZYb4YOj5gL07LcYHBk4dX2b5kWatJC2Q=
3 changes: 3 additions & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
xmltodict==0.9.2
boto>=2.36.0
python-dateutil==2.4.2
pyOpenSSL==16.2.0
openpyxl==2.4.0
ndg-httpsclient==0.4.3
-e git+https://[email protected]/uc-cdis/[email protected]#egg=indexclient
-e git+https://github.com/uc-cdis/[email protected]#egg=cdispyutils # required by indexd
-e git+https://github.com/uc-cdis/[email protected]#egg=doiclient
Expand Down
14 changes: 8 additions & 6 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,17 @@

setup(
name="cdisutils",
version="0.1.1",
version="1.2.2",
description="Miscellaneous utilities useful for interaction with CDIS systems.",
license="Apache",
packages=["cdisutils"],
install_requires=[
'setuptools',
'xmltodict==0.9.2',
'pyOpenSSL==16.2.0',
'openpyxl==2.4.0',
'ndg-httpsclient==0.4.3',
'xmltodict>=0.9.2',
'pyOpenSSL>=16.2.0',
'openpyxl>=2.4.0',
'ndg-httpsclient>=0.4.3',
'boto>=2.36.0',
'python-dateutil>=2.4.2',
'indexclient>=1.5.6',
],
)
5 changes: 3 additions & 2 deletions test/test_boto_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from unittest import TestCase
from unittest import TestCase, skip
from cdisutils.net import BotoManager, cancel_stale_multiparts, md5sum_with_size
from cdisutils.net import url_for_boto_key

Expand Down Expand Up @@ -71,6 +71,7 @@ def test_url_for_boto_key(self):
key = buck.new_key("bar")
self.assertEqual(url_for_boto_key(key), "s3://s3.amazonaws.com/foo/bar")

@skip("`bad_status_line` issue in urllib3/mock")
def test_cancel_stale_multiparts(self):
with mock_s3():
conn = boto.connect_s3()
Expand All @@ -81,7 +82,7 @@ def test_cancel_stale_multiparts(self):
# so newly created uploads actually are created > 7 days.
assert len(bucket.get_all_multipart_uploads()) == 0


@skip("`bad_status_line` issue in urllib3/mock")
def test_cancel_stale_multiparts_does_not_cancel_active_uploads(self):
with mock_s3():
conn = boto.connect_s3()
Expand Down