darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2025-12-10 15:13:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

utils bump

Browse Source 
also dont use splitlines on csv data, there might be quoted newlines we dont want to split on
This commit is contained in:
Leo Hemsted
2019-08-02 14:34:05 +01:00
parent e72540d3f9
commit 1d67c82f0f
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -59,6 +59,7 @@ docs/_build/
target/ target/
.idea/ .idea/
.DS_Store .DS_Store
.vscode
# Frontend dependencies and compiled assets # Frontend dependencies and compiled assets
app/assets/stylesheets/govuk_template/.sass-cache/ app/assets/stylesheets/govuk_template/.sass-cache/

2
app/utils.py
View File

@@ -304,7 +304,7 @@ class Spreadsheet():
def as_rows(self): def as_rows(self):
if not self._rows: if not self._rows:
self._rows = list(csv.reader( self._rows = list(csv.reader(
self._csv_data.strip().splitlines(), StringIO(self._csv_data),
quoting=csv.QUOTE_MINIMAL, quoting=csv.QUOTE_MINIMAL,
skipinitialspace=True, skipinitialspace=True,
)) ))

1
pytest.ini
View File

@@ -14,3 +14,4 @@ env =
filterwarnings = filterwarnings =
error:Applying marks directly:pytest.RemovedInPytest4Warning error:Applying marks directly:pytest.RemovedInPytest4Warning
addopts = -p no:warnings

2
requirements-app.txt
View File

@@ -23,4 +23,4 @@ awscli-cwlogs>=1.4,<1.5
# Putting upgrade on hold due to v1.0.0 using sha512 instead of sha1 by default # Putting upgrade on hold due to v1.0.0 using sha512 instead of sha1 by default
itsdangerous==0.24 # pyup: <1.0.0 itsdangerous==0.24 # pyup: <1.0.0
git+https://github.com/alphagov/notifications-utils.git@33.2.4#egg=notifications-utils==33.2.4 git+https://github.com/alphagov/notifications-utils.git@33.2.8#egg=notifications-utils==33.2.8

12
requirements.txt
View File

@@ -25,13 +25,13 @@ awscli-cwlogs>=1.4,<1.5
# Putting upgrade on hold due to v1.0.0 using sha512 instead of sha1 by default # Putting upgrade on hold due to v1.0.0 using sha512 instead of sha1 by default
itsdangerous==0.24 # pyup: <1.0.0 itsdangerous==0.24 # pyup: <1.0.0
git+https://github.com/alphagov/notifications-utils.git@33.2.4#egg=notifications-utils==33.2.4 git+https://github.com/alphagov/notifications-utils.git@33.2.8#egg=notifications-utils==33.2.8
## The following requirements were added by pip freeze: ## The following requirements were added by pip freeze:
awscli==1.16.199 awscli==1.16.209
bleach==3.1.0 bleach==3.1.0
boto3==1.6.16 boto3==1.6.16
botocore==1.12.189 botocore==1.12.199
certifi==2019.6.16 certifi==2019.6.16
chardet==3.0.4 chardet==3.0.4
Click==7.0 Click==7.0
@@ -48,21 +48,21 @@ jdcal==1.4.1
Jinja2==2.10.1 Jinja2==2.10.1
jmespath==0.9.4 jmespath==0.9.4
lml==0.0.9 lml==0.0.9
lxml==4.3.4 lxml==4.4.0
MarkupSafe==1.1.1 MarkupSafe==1.1.1
mistune==0.8.4 mistune==0.8.4
monotonic==1.5 monotonic==1.5
openpyxl==2.5.14 openpyxl==2.5.14
orderedset==2.0.1 orderedset==2.0.1
phonenumbers==8.10.13 phonenumbers==8.10.13
pyasn1==0.4.5 pyasn1==0.4.6
pyexcel-ezodf==0.3.4 pyexcel-ezodf==0.3.4
PyJWT==1.7.1 PyJWT==1.7.1
PyPDF2==1.26.0 PyPDF2==1.26.0
python-dateutil==2.8.0 python-dateutil==2.8.0
python-json-logger==0.1.11 python-json-logger==0.1.11
PyYAML==4.2b1 PyYAML==4.2b1
redis==3.2.1 redis==3.3.4
requests==2.22.0 requests==2.22.0
rsa==3.4.2 rsa==3.4.2
s3transfer==0.2.1 s3transfer==0.2.1