From 5028a6114c3e4ac3dd9fe972b879af4baf5e566c Mon Sep 17 00:00:00 2001 From: dio Date: Thu, 28 May 2020 17:07:05 +0700 Subject: [PATCH 1/4] fixed the requirement from progressbar2 to progressbar33 --- .gitignore | 2 ++ setup.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f31fb7f..7e3b7b5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ *.pyc *.sublime-project *.sublime-workspace +.idea .cache .coverage .coveralls.yml @@ -15,3 +16,4 @@ build/ dist/ MANIFEST + diff --git a/setup.py b/setup.py index 6428b22..76e6699 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ install_requires=[ 'GeoAlchemy2', 'ipdb', - 'progressbar2', + 'progressbar33', 'psycopg2', 'requests', 'SQLAlchemy', From 8e458b7f37971951a29b87e565426cb499fd2c17 Mon Sep 17 00:00:00 2001 From: dio Date: Thu, 28 May 2020 17:07:15 +0700 Subject: [PATCH 2/4] fixed get_download_config filtering --- sqlalchemy_geonames/bin/sqlageonames.py | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/sqlalchemy_geonames/bin/sqlageonames.py b/sqlalchemy_geonames/bin/sqlageonames.py index 2e7e8fc..066fcf0 100644 --- a/sqlalchemy_geonames/bin/sqlageonames.py +++ b/sqlalchemy_geonames/bin/sqlageonames.py @@ -17,7 +17,6 @@ import argparse import os import sys -from copy import deepcopy from zipfile import ZipFile import requests from progressbar import ProgressBar, ETA, FileTransferSpeed, Percentage, Bar @@ -56,19 +55,12 @@ def get_local_filepath(filename, download_dir=DEFAULT_DOWNLOAD_DIR): def get_download_config(primary_filename, language_code=DEFAULT_LANGUAGE_CODE): - download_config = {k: v for k, v in deepcopy(filename_config).items() - if k in supported_filenames} - for filename, opts in download_config.items(): - # Only download the selected primary primary_filename file - if ( - filename in PRIMARY_GEONAME_FILENAMES and - filename != primary_filename - ): - del download_config[filename] - # If a file is bound to a specific language code and is not the - # specified one then remove it. - if 'language_code' in opts and opts['language_code'] != language_code: - del download_config[filename] + download_config = {} + for filename, opts in filename_config.items(): + if filename in supported_filenames and not ( + (filename in PRIMARY_GEONAME_FILENAMES and filename != primary_filename) or 'language_code' in opts and + opts['language_code'] != language_code): + download_config[filename] = opts return download_config From dd356d89bb5a21452e5ada851fb926a4da4e5d12 Mon Sep 17 00:00:00 2001 From: dio Date: Thu, 28 May 2020 19:49:23 +0700 Subject: [PATCH 3/4] modified cc2 field to be 200 characters long --- sqlalchemy_geonames/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sqlalchemy_geonames/models.py b/sqlalchemy_geonames/models.py index a7cbfef..8ba5fcc 100644 --- a/sqlalchemy_geonames/models.py +++ b/sqlalchemy_geonames/models.py @@ -103,8 +103,8 @@ class Geoname(GeonameBase): country = relationship(GeonameCountry) # alternate country codes, comma separated, ISO-3166 2-letter country - # code, 60 characters - cc2 = Column(String(60), nullable=False) + # code, 200 characters + cc2 = Column(String(200), nullable=False) # fipscode (subject to change to iso code), see exceptions below, see # file admin1Codes.txt for display names of this code; varchar(20) From 0d2542cf53512b14415319f23ad53dc4994691a8 Mon Sep 17 00:00:00 2001 From: dio Date: Fri, 29 May 2020 10:05:14 +0700 Subject: [PATCH 4/4] adding postgis2.5 to travis --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index a0a59b4..e05990d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,12 @@ matrix: - python: 3.5 env: TOX_ENV=lint +addons: + postgresql: 11 + apt: + packages: + - postgresql-11-postgis-2.5 + install: - pip install tox