From 312e0d3a46beee458e89a36763eb83b008edc3a5 Mon Sep 17 00:00:00 2001 From: Jean Cochrane Date: Wed, 27 Jun 2018 15:37:16 -0400 Subject: [PATCH 01/20] Set up Travis to deploy to PyPi from master --- .travis.yml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59aa83b..da9beff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,14 @@ +branches: + only: + - develop + - master + language: python python: - #- "3.3" # Fails, add support later! - - "2.7" + - '2.7' addons: - postgresql: "9.4" + postgresql: '9.4' apt: packages: - postgresql-9.4-postgis-2.3 @@ -18,3 +22,13 @@ before_script: install: pip install --process-dependency-links --allow-external djsonb -e ./ script: python run_tests.py + +deploy: + provider: pypi + distributions: sdist bdist_wheel + skip_existing: true + on: + branch: master + user: azavea + password: + secure: g36helTRPikOvYPDWK/LJUpa0fb34VaI0/Lj/MpAHBt35uOnMoHtcfbQFUBcl46y3izWuLGqgUMyoltsUDXm6lIdoWXMhv4V2vg1HnNi87ELqfZbWViv2uo6QYfv1NAggZmYsSMLghBL9iJEV8MDc2XboRaJ+0oKblagIpw3cq95BxYnCh9pskTQC4R8mXUY4vG5t5U2KAvvUpWbDGmVSBKX4rLS/QBotzAMBZrcXs+/pQ/BGWz4nCE9Apoxe1igii1TNgwAbe9nwsgV6uOYdEYIrNtybXA31nb8w78J8XT03Xand/kUfeSRaKOxA27w67I1ygE0xSf0ADYrqehZJL0l09FjR3PyCmX9uzaQrHp3NMoF4HDPAj+nWThZAp7J5SVhf6yQXx07qjXLMEQEHpS+t5a2GSQ+2Z0FUmsSIz5SJjagmLOR+jPfyua0VogTFO2+kwfhaQoJtm0cP3PEFNTpVdzcHoqLrK/G2XJHDwEkIXzUDNPqRlCuWCJ+hV+rStFuk6GxzJ2tc1l6IuTUoWApSfpRAbYLCGIju5BAmkoJsnKrvFYWkdsdIt/4fMevjHY4IJTMQ6Va9Z90s597uEe279D2bLp7d7r+WKEC6mzLrt+DuwxijhjyAh4H3WhnFznolSUKXxpYZPDPV3kcDZ68P1MiZwohZ81DUDcw2TU= From 225236c6a80a8a9e38ab7339e60119c1507e1ea0 Mon Sep 17 00:00:00 2001 From: Jean Cochrane Date: Wed, 27 Jun 2018 15:37:51 -0400 Subject: [PATCH 02/20] Bump version to 1.0.0 (legacy release) --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2f227e6..0882933 100755 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setup( name='ashlar', - version='0.0.2', + version='1.0.0', description='Define and validate schemas for metadata for geotemporal event records', author='Azavea, Inc.', author_email='info@azavea.com', From ab70603ca555ea5eab197c05a89646bc6110b7fa Mon Sep 17 00:00:00 2001 From: Jean Cochrane Date: Thu, 28 Jun 2018 11:12:32 -0400 Subject: [PATCH 03/20] Update copyright years and package metadata --- LICENSE | 2 +- setup.py | 32 +++++++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index d80a868..f0cb0f5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015 Azavea +Copyright (c) 2015-2018 Azavea Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/setup.py b/setup.py index 0882933..3985027 100755 --- a/setup.py +++ b/setup.py @@ -4,12 +4,21 @@ tests_require = [] + +def readme(): + with open('README.md') as f: + return f.read() + setup( name='ashlar', version='1.0.0', - description='Define and validate schemas for metadata for geotemporal event records', author='Azavea, Inc.', author_email='info@azavea.com', + description='A flexible schema framework for geospatial data.', + long_description=readme(), + long_description_content_type='text/markdown', + url='https://github.com/azavea/ashlar', + license='MIT', keywords='gis jsonschema', packages=find_packages(exclude=['tests']), dependency_links=[ @@ -35,4 +44,25 @@ }, test_suite='tests', tests_require=tests_require, + classifiers=[ + 'Development Status :: 5 - Production/Stable', + 'Topic :: Database', + 'Topic :: Database :: Database Engines/Servers', + 'Topic :: Database :: Front-Ends', + 'Topic :: Internet :: WWW/HTTP', + 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', + 'Topic :: Internet :: WWW/HTTP :: WSGI', + 'Topic :: Internet :: WWW/HTTP :: WSGI :: Server', + 'Topic :: Software Development :: Libraries', + 'Topic :: Software Development :: Libraries :: Application Frameworks', + 'Environment :: Web Environment', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: MIT License', + 'Programming Language :: Python', + 'Programming Language :: Python :: 2 :: Only', + 'Programming Language :: Python :: 2.7', + 'Framework :: Django', + 'Framework :: Django :: 1.8', + 'Operating System :: OS Independent', + ], ) From eeb79c41b62f0e451aa3793c2b6904dd5da2cc59 Mon Sep 17 00:00:00 2001 From: Jean Cochrane Date: Thu, 28 Jun 2018 11:40:26 -0400 Subject: [PATCH 04/20] Deploy to PyPi test instance from develop branch --- .travis.yml | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index da9beff..a0b0e0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,11 +24,21 @@ install: pip install --process-dependency-links --allow-external djsonb -e ./ script: python run_tests.py deploy: - provider: pypi - distributions: sdist bdist_wheel - skip_existing: true - on: - branch: master - user: azavea - password: - secure: g36helTRPikOvYPDWK/LJUpa0fb34VaI0/Lj/MpAHBt35uOnMoHtcfbQFUBcl46y3izWuLGqgUMyoltsUDXm6lIdoWXMhv4V2vg1HnNi87ELqfZbWViv2uo6QYfv1NAggZmYsSMLghBL9iJEV8MDc2XboRaJ+0oKblagIpw3cq95BxYnCh9pskTQC4R8mXUY4vG5t5U2KAvvUpWbDGmVSBKX4rLS/QBotzAMBZrcXs+/pQ/BGWz4nCE9Apoxe1igii1TNgwAbe9nwsgV6uOYdEYIrNtybXA31nb8w78J8XT03Xand/kUfeSRaKOxA27w67I1ygE0xSf0ADYrqehZJL0l09FjR3PyCmX9uzaQrHp3NMoF4HDPAj+nWThZAp7J5SVhf6yQXx07qjXLMEQEHpS+t5a2GSQ+2Z0FUmsSIz5SJjagmLOR+jPfyua0VogTFO2+kwfhaQoJtm0cP3PEFNTpVdzcHoqLrK/G2XJHDwEkIXzUDNPqRlCuWCJ+hV+rStFuk6GxzJ2tc1l6IuTUoWApSfpRAbYLCGIju5BAmkoJsnKrvFYWkdsdIt/4fMevjHY4IJTMQ6Va9Z90s597uEe279D2bLp7d7r+WKEC6mzLrt+DuwxijhjyAh4H3WhnFznolSUKXxpYZPDPV3kcDZ68P1MiZwohZ81DUDcw2TU= + - provider: pypi + distributions: sdist bdist_wheel + skip_existing: true + on: + branch: master + user: azavea + password: + secure: g36helTRPikOvYPDWK/LJUpa0fb34VaI0/Lj/MpAHBt35uOnMoHtcfbQFUBcl46y3izWuLGqgUMyoltsUDXm6lIdoWXMhv4V2vg1HnNi87ELqfZbWViv2uo6QYfv1NAggZmYsSMLghBL9iJEV8MDc2XboRaJ+0oKblagIpw3cq95BxYnCh9pskTQC4R8mXUY4vG5t5U2KAvvUpWbDGmVSBKX4rLS/QBotzAMBZrcXs+/pQ/BGWz4nCE9Apoxe1igii1TNgwAbe9nwsgV6uOYdEYIrNtybXA31nb8w78J8XT03Xand/kUfeSRaKOxA27w67I1ygE0xSf0ADYrqehZJL0l09FjR3PyCmX9uzaQrHp3NMoF4HDPAj+nWThZAp7J5SVhf6yQXx07qjXLMEQEHpS+t5a2GSQ+2Z0FUmsSIz5SJjagmLOR+jPfyua0VogTFO2+kwfhaQoJtm0cP3PEFNTpVdzcHoqLrK/G2XJHDwEkIXzUDNPqRlCuWCJ+hV+rStFuk6GxzJ2tc1l6IuTUoWApSfpRAbYLCGIju5BAmkoJsnKrvFYWkdsdIt/4fMevjHY4IJTMQ6Va9Z90s597uEe279D2bLp7d7r+WKEC6mzLrt+DuwxijhjyAh4H3WhnFznolSUKXxpYZPDPV3kcDZ68P1MiZwohZ81DUDcw2TU= + + - provider: pypi + distributions: sdist bdist_wheel + skip_existing: true + on: + branch: deploy + user: azavea + password: + secure: g36helTRPikOvYPDWK/LJUpa0fb34VaI0/Lj/MpAHBt35uOnMoHtcfbQFUBcl46y3izWuLGqgUMyoltsUDXm6lIdoWXMhv4V2vg1HnNi87ELqfZbWViv2uo6QYfv1NAggZmYsSMLghBL9iJEV8MDc2XboRaJ+0oKblagIpw3cq95BxYnCh9pskTQC4R8mXUY4vG5t5U2KAvvUpWbDGmVSBKX4rLS/QBotzAMBZrcXs+/pQ/BGWz4nCE9Apoxe1igii1TNgwAbe9nwsgV6uOYdEYIrNtybXA31nb8w78J8XT03Xand/kUfeSRaKOxA27w67I1ygE0xSf0ADYrqehZJL0l09FjR3PyCmX9uzaQrHp3NMoF4HDPAj+nWThZAp7J5SVhf6yQXx07qjXLMEQEHpS+t5a2GSQ+2Z0FUmsSIz5SJjagmLOR+jPfyua0VogTFO2+kwfhaQoJtm0cP3PEFNTpVdzcHoqLrK/G2XJHDwEkIXzUDNPqRlCuWCJ+hV+rStFuk6GxzJ2tc1l6IuTUoWApSfpRAbYLCGIju5BAmkoJsnKrvFYWkdsdIt/4fMevjHY4IJTMQ6Va9Z90s597uEe279D2bLp7d7r+WKEC6mzLrt+DuwxijhjyAh4H3WhnFznolSUKXxpYZPDPV3kcDZ68P1MiZwohZ81DUDcw2TU= + server: https://test.pypi.org/ From 84572aa149ddce0bee104bc56bfba3ffb293f814 Mon Sep 17 00:00:00 2001 From: Jean Cochrane Date: Thu, 28 Jun 2018 11:42:27 -0400 Subject: [PATCH 05/20] Add README and LICENSE to manifest --- MANIFEST.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MANIFEST.in b/MANIFEST.in index 37f630a..8df0401 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1,3 @@ recursive-include tests * +README.md +LICENSE From 464a201984efeee5ee86d3772974e0380c17d9b2 Mon Sep 17 00:00:00 2001 From: Jean Cochrane Date: Fri, 29 Jun 2018 14:15:14 -0400 Subject: [PATCH 06/20] Run travis builds for all branches --- .travis.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index a0b0e0d..aed5477 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,3 @@ -branches: - only: - - develop - - master - language: python python: - '2.7' From 6149756bd17565b7d26e41c9da4500188fbf6e78 Mon Sep 17 00:00:00 2001 From: Jean Cochrane Date: Fri, 29 Jun 2018 14:19:14 -0400 Subject: [PATCH 07/20] Deploy to PyPi testing server from pypi branch --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index aed5477..9ab87f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ deploy: distributions: sdist bdist_wheel skip_existing: true on: - branch: deploy + branch: pypi user: azavea password: secure: g36helTRPikOvYPDWK/LJUpa0fb34VaI0/Lj/MpAHBt35uOnMoHtcfbQFUBcl46y3izWuLGqgUMyoltsUDXm6lIdoWXMhv4V2vg1HnNi87ELqfZbWViv2uo6QYfv1NAggZmYsSMLghBL9iJEV8MDc2XboRaJ+0oKblagIpw3cq95BxYnCh9pskTQC4R8mXUY4vG5t5U2KAvvUpWbDGmVSBKX4rLS/QBotzAMBZrcXs+/pQ/BGWz4nCE9Apoxe1igii1TNgwAbe9nwsgV6uOYdEYIrNtybXA31nb8w78J8XT03Xand/kUfeSRaKOxA27w67I1ygE0xSf0ADYrqehZJL0l09FjR3PyCmX9uzaQrHp3NMoF4HDPAj+nWThZAp7J5SVhf6yQXx07qjXLMEQEHpS+t5a2GSQ+2Z0FUmsSIz5SJjagmLOR+jPfyua0VogTFO2+kwfhaQoJtm0cP3PEFNTpVdzcHoqLrK/G2XJHDwEkIXzUDNPqRlCuWCJ+hV+rStFuk6GxzJ2tc1l6IuTUoWApSfpRAbYLCGIju5BAmkoJsnKrvFYWkdsdIt/4fMevjHY4IJTMQ6Va9Z90s597uEe279D2bLp7d7r+WKEC6mzLrt+DuwxijhjyAh4H3WhnFznolSUKXxpYZPDPV3kcDZ68P1MiZwohZ81DUDcw2TU= From a43fb567a23dc9f665687d51eeb72d02739c4067 Mon Sep 17 00:00:00 2001 From: Jean Cochrane Date: Fri, 29 Jun 2018 14:28:23 -0400 Subject: [PATCH 08/20] Try a different URL for test PyPi instance --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9ab87f1..378e7ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,4 +36,4 @@ deploy: user: azavea password: secure: g36helTRPikOvYPDWK/LJUpa0fb34VaI0/Lj/MpAHBt35uOnMoHtcfbQFUBcl46y3izWuLGqgUMyoltsUDXm6lIdoWXMhv4V2vg1HnNi87ELqfZbWViv2uo6QYfv1NAggZmYsSMLghBL9iJEV8MDc2XboRaJ+0oKblagIpw3cq95BxYnCh9pskTQC4R8mXUY4vG5t5U2KAvvUpWbDGmVSBKX4rLS/QBotzAMBZrcXs+/pQ/BGWz4nCE9Apoxe1igii1TNgwAbe9nwsgV6uOYdEYIrNtybXA31nb8w78J8XT03Xand/kUfeSRaKOxA27w67I1ygE0xSf0ADYrqehZJL0l09FjR3PyCmX9uzaQrHp3NMoF4HDPAj+nWThZAp7J5SVhf6yQXx07qjXLMEQEHpS+t5a2GSQ+2Z0FUmsSIz5SJjagmLOR+jPfyua0VogTFO2+kwfhaQoJtm0cP3PEFNTpVdzcHoqLrK/G2XJHDwEkIXzUDNPqRlCuWCJ+hV+rStFuk6GxzJ2tc1l6IuTUoWApSfpRAbYLCGIju5BAmkoJsnKrvFYWkdsdIt/4fMevjHY4IJTMQ6Va9Z90s597uEe279D2bLp7d7r+WKEC6mzLrt+DuwxijhjyAh4H3WhnFznolSUKXxpYZPDPV3kcDZ68P1MiZwohZ81DUDcw2TU= - server: https://test.pypi.org/ + server: https://test.pypi.org/legacy From 755bd03e0c1499dadd151b490e25c85eb6c6be73 Mon Sep 17 00:00:00 2001 From: Jean Cochrane Date: Fri, 29 Jun 2018 14:30:42 -0400 Subject: [PATCH 09/20] Try another URL for test PyPi instance --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 378e7ce..da754d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,4 +36,4 @@ deploy: user: azavea password: secure: g36helTRPikOvYPDWK/LJUpa0fb34VaI0/Lj/MpAHBt35uOnMoHtcfbQFUBcl46y3izWuLGqgUMyoltsUDXm6lIdoWXMhv4V2vg1HnNi87ELqfZbWViv2uo6QYfv1NAggZmYsSMLghBL9iJEV8MDc2XboRaJ+0oKblagIpw3cq95BxYnCh9pskTQC4R8mXUY4vG5t5U2KAvvUpWbDGmVSBKX4rLS/QBotzAMBZrcXs+/pQ/BGWz4nCE9Apoxe1igii1TNgwAbe9nwsgV6uOYdEYIrNtybXA31nb8w78J8XT03Xand/kUfeSRaKOxA27w67I1ygE0xSf0ADYrqehZJL0l09FjR3PyCmX9uzaQrHp3NMoF4HDPAj+nWThZAp7J5SVhf6yQXx07qjXLMEQEHpS+t5a2GSQ+2Z0FUmsSIz5SJjagmLOR+jPfyua0VogTFO2+kwfhaQoJtm0cP3PEFNTpVdzcHoqLrK/G2XJHDwEkIXzUDNPqRlCuWCJ+hV+rStFuk6GxzJ2tc1l6IuTUoWApSfpRAbYLCGIju5BAmkoJsnKrvFYWkdsdIt/4fMevjHY4IJTMQ6Va9Z90s597uEe279D2bLp7d7r+WKEC6mzLrt+DuwxijhjyAh4H3WhnFznolSUKXxpYZPDPV3kcDZ68P1MiZwohZ81DUDcw2TU= - server: https://test.pypi.org/legacy + server: https://test.pypi.org/legacy/ From 320955dc28cd479d85d2c2e341879cf5822bdefe Mon Sep 17 00:00:00 2001 From: Jean Cochrane Date: Fri, 29 Jun 2018 14:47:27 -0400 Subject: [PATCH 10/20] Try escaping special characters in PyPi credentials --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index da754d2..17fd1c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,6 +34,6 @@ deploy: on: branch: pypi user: azavea - password: - secure: g36helTRPikOvYPDWK/LJUpa0fb34VaI0/Lj/MpAHBt35uOnMoHtcfbQFUBcl46y3izWuLGqgUMyoltsUDXm6lIdoWXMhv4V2vg1HnNi87ELqfZbWViv2uo6QYfv1NAggZmYsSMLghBL9iJEV8MDc2XboRaJ+0oKblagIpw3cq95BxYnCh9pskTQC4R8mXUY4vG5t5U2KAvvUpWbDGmVSBKX4rLS/QBotzAMBZrcXs+/pQ/BGWz4nCE9Apoxe1igii1TNgwAbe9nwsgV6uOYdEYIrNtybXA31nb8w78J8XT03Xand/kUfeSRaKOxA27w67I1ygE0xSf0ADYrqehZJL0l09FjR3PyCmX9uzaQrHp3NMoF4HDPAj+nWThZAp7J5SVhf6yQXx07qjXLMEQEHpS+t5a2GSQ+2Z0FUmsSIz5SJjagmLOR+jPfyua0VogTFO2+kwfhaQoJtm0cP3PEFNTpVdzcHoqLrK/G2XJHDwEkIXzUDNPqRlCuWCJ+hV+rStFuk6GxzJ2tc1l6IuTUoWApSfpRAbYLCGIju5BAmkoJsnKrvFYWkdsdIt/4fMevjHY4IJTMQ6Va9Z90s597uEe279D2bLp7d7r+WKEC6mzLrt+DuwxijhjyAh4H3WhnFznolSUKXxpYZPDPV3kcDZ68P1MiZwohZ81DUDcw2TU= server: https://test.pypi.org/legacy/ + password: + secure: kKxaDydGUTEhp/DXsvhAjTkwgiKvhvHVaFRO1ZMNx7ed0U5lcYybCIPW968HQ1WFPGH1H0Jy/QFiDmHS1KxBgN3iTghoRKO8VJvyE6HYOZa43MzUJ9zhlJHc8dTDWQGeckaRClCm3cxO/J/U6c5qwiAnuHRh0UMyEPzhU7wwHFw= From 81b2b15035f229a7fcfe3794e3870d4b0da28338 Mon Sep 17 00:00:00 2001 From: Jean Cochrane Date: Fri, 29 Jun 2018 14:54:27 -0400 Subject: [PATCH 11/20] Try a different PyPi URL --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 17fd1c1..32d9ae6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,6 +34,6 @@ deploy: on: branch: pypi user: azavea - server: https://test.pypi.org/legacy/ + server: https://test.pypi.org/simple/ password: secure: kKxaDydGUTEhp/DXsvhAjTkwgiKvhvHVaFRO1ZMNx7ed0U5lcYybCIPW968HQ1WFPGH1H0Jy/QFiDmHS1KxBgN3iTghoRKO8VJvyE6HYOZa43MzUJ9zhlJHc8dTDWQGeckaRClCm3cxO/J/U6c5qwiAnuHRh0UMyEPzhU7wwHFw= From 9fbe26df59d2c7605606e6c5ce78059d48cfcb8a Mon Sep 17 00:00:00 2001 From: Jean Cochrane Date: Fri, 29 Jun 2018 15:23:43 -0400 Subject: [PATCH 12/20] Reencrypt deployment credentials --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 32d9ae6..5ce9ee3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,6 +34,6 @@ deploy: on: branch: pypi user: azavea - server: https://test.pypi.org/simple/ - password: - secure: kKxaDydGUTEhp/DXsvhAjTkwgiKvhvHVaFRO1ZMNx7ed0U5lcYybCIPW968HQ1WFPGH1H0Jy/QFiDmHS1KxBgN3iTghoRKO8VJvyE6HYOZa43MzUJ9zhlJHc8dTDWQGeckaRClCm3cxO/J/U6c5qwiAnuHRh0UMyEPzhU7wwHFw= + server: https://test.pypi.org/legacy/ + password: + secure: Wtjjlo8+b3qjRzC+bWiO1yeDks42lVSIuVeUCXf9Tt4wneLGPwtWIreiqZZoGZgVa1IpwCe7e0CCRwV0R3rWGXtTBDCuzbDNVjOUC2RNqPIBegFNdUQcui3bZu85oSUYTgcUYsQeRmBJNPwRA2BeOjomEcKl2weJeF65mLH2t5M= From b3773dd0a838bbddac07a9a1b93aae1837d676d2 Mon Sep 17 00:00:00 2001 From: Jean Cochrane Date: Fri, 29 Jun 2018 15:25:51 -0400 Subject: [PATCH 13/20] Fix yml parsing error in Travis config --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5ce9ee3..1064d5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,5 +35,5 @@ deploy: branch: pypi user: azavea server: https://test.pypi.org/legacy/ - password: - secure: Wtjjlo8+b3qjRzC+bWiO1yeDks42lVSIuVeUCXf9Tt4wneLGPwtWIreiqZZoGZgVa1IpwCe7e0CCRwV0R3rWGXtTBDCuzbDNVjOUC2RNqPIBegFNdUQcui3bZu85oSUYTgcUYsQeRmBJNPwRA2BeOjomEcKl2weJeF65mLH2t5M= + password: + secure: Wtjjlo8+b3qjRzC+bWiO1yeDks42lVSIuVeUCXf9Tt4wneLGPwtWIreiqZZoGZgVa1IpwCe7e0CCRwV0R3rWGXtTBDCuzbDNVjOUC2RNqPIBegFNdUQcui3bZu85oSUYTgcUYsQeRmBJNPwRA2BeOjomEcKl2weJeF65mLH2t5M= From b5e8d789c418a763247c2f65b120bb79ac63c1c1 Mon Sep 17 00:00:00 2001 From: Jean Cochrane Date: Fri, 29 Jun 2018 15:28:07 -0400 Subject: [PATCH 14/20] Try deploying to production PyPi --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1064d5e..23678c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,6 +34,5 @@ deploy: on: branch: pypi user: azavea - server: https://test.pypi.org/legacy/ password: secure: Wtjjlo8+b3qjRzC+bWiO1yeDks42lVSIuVeUCXf9Tt4wneLGPwtWIreiqZZoGZgVa1IpwCe7e0CCRwV0R3rWGXtTBDCuzbDNVjOUC2RNqPIBegFNdUQcui3bZu85oSUYTgcUYsQeRmBJNPwRA2BeOjomEcKl2weJeF65mLH2t5M= From 3748f8f853e14a85168bbd96a7cc3cc2becf346f Mon Sep 17 00:00:00 2001 From: Jean Cochrane Date: Fri, 29 Jun 2018 17:33:33 -0400 Subject: [PATCH 15/20] Try regenerating deploy section of travis.yml --- .travis.yml | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index 23678c5..30bddd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,38 +1,24 @@ language: python python: - - '2.7' - +- '2.7' addons: postgresql: '9.4' apt: packages: - - postgresql-9.4-postgis-2.3 - + - postgresql-9.4-postgis-2.3 env: - - DJANGO_SETTINGS_MODULE='settings_travis' - +- DJANGO_SETTINGS_MODULE='settings_travis' before_script: - - psql -U postgres -c "create extension postgis" - +- psql -U postgres -c "create extension postgis" install: pip install --process-dependency-links --allow-external djsonb -e ./ - script: python run_tests.py - deploy: - - provider: pypi + provider: pypi + user: azavea + server: https://test.pypi.org/legacy/ + password: + secure: njBP/Er6Xlkt+Fx+z3hKTdBY/6J6l8VCemQPVoJkn9s7mLRBLIqsImN88bgfo96dNNuwwawvpG6Udm8Kb/QNroYvortxMovLqnnuEudu/STlXuWlS0c5aFTb2Ms65xsXRHMp5n7b3poFYrvMJVq0CkWYMEFI5PYwG/C7uIRiJgo= + on: distributions: sdist bdist_wheel - skip_existing: true - on: - branch: master - user: azavea - password: - secure: g36helTRPikOvYPDWK/LJUpa0fb34VaI0/Lj/MpAHBt35uOnMoHtcfbQFUBcl46y3izWuLGqgUMyoltsUDXm6lIdoWXMhv4V2vg1HnNi87ELqfZbWViv2uo6QYfv1NAggZmYsSMLghBL9iJEV8MDc2XboRaJ+0oKblagIpw3cq95BxYnCh9pskTQC4R8mXUY4vG5t5U2KAvvUpWbDGmVSBKX4rLS/QBotzAMBZrcXs+/pQ/BGWz4nCE9Apoxe1igii1TNgwAbe9nwsgV6uOYdEYIrNtybXA31nb8w78J8XT03Xand/kUfeSRaKOxA27w67I1ygE0xSf0ADYrqehZJL0l09FjR3PyCmX9uzaQrHp3NMoF4HDPAj+nWThZAp7J5SVhf6yQXx07qjXLMEQEHpS+t5a2GSQ+2Z0FUmsSIz5SJjagmLOR+jPfyua0VogTFO2+kwfhaQoJtm0cP3PEFNTpVdzcHoqLrK/G2XJHDwEkIXzUDNPqRlCuWCJ+hV+rStFuk6GxzJ2tc1l6IuTUoWApSfpRAbYLCGIju5BAmkoJsnKrvFYWkdsdIt/4fMevjHY4IJTMQ6Va9Z90s597uEe279D2bLp7d7r+WKEC6mzLrt+DuwxijhjyAh4H3WhnFznolSUKXxpYZPDPV3kcDZ68P1MiZwohZ81DUDcw2TU= - - - provider: pypi - distributions: sdist bdist_wheel - skip_existing: true - on: - branch: pypi - user: azavea - password: - secure: Wtjjlo8+b3qjRzC+bWiO1yeDks42lVSIuVeUCXf9Tt4wneLGPwtWIreiqZZoGZgVa1IpwCe7e0CCRwV0R3rWGXtTBDCuzbDNVjOUC2RNqPIBegFNdUQcui3bZu85oSUYTgcUYsQeRmBJNPwRA2BeOjomEcKl2weJeF65mLH2t5M= + repo: azavea/ashlar + branch: pypi From a82bf0b031586cc87798738d71afaeb682a6e327 Mon Sep 17 00:00:00 2001 From: Jean Cochrane Date: Fri, 29 Jun 2018 17:37:57 -0400 Subject: [PATCH 16/20] Try not escaping special characters in credentials --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 30bddd2..5f2db8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ deploy: user: azavea server: https://test.pypi.org/legacy/ password: - secure: njBP/Er6Xlkt+Fx+z3hKTdBY/6J6l8VCemQPVoJkn9s7mLRBLIqsImN88bgfo96dNNuwwawvpG6Udm8Kb/QNroYvortxMovLqnnuEudu/STlXuWlS0c5aFTb2Ms65xsXRHMp5n7b3poFYrvMJVq0CkWYMEFI5PYwG/C7uIRiJgo= + secure: nJzbqe5/vJyEXv80K8FAC40R1AyaATS7v+gJiRGVCsj8WtAjon5tT9+KCUyO2swVNsnJBYhW9uZuzmglZrp/SymWyC3SgVcGcF8z1DH130MsD76Go5ROtVLSC1wrmnmtUc7bDb8UgVarAUUOkIMPYaBi+Z4SBGU4gXZCaLonvjo= on: distributions: sdist bdist_wheel repo: azavea/ashlar From 2094734359269004369153df586b520d65a0cae3 Mon Sep 17 00:00:00 2001 From: Jean Cochrane Date: Mon, 2 Jul 2018 08:44:19 -0400 Subject: [PATCH 17/20] Try using a new PyPi test instance account --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5f2db8e..1f9d957 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,10 +14,10 @@ install: pip install --process-dependency-links --allow-external djsonb -e ./ script: python run_tests.py deploy: provider: pypi - user: azavea + user: jeancochrane server: https://test.pypi.org/legacy/ password: - secure: nJzbqe5/vJyEXv80K8FAC40R1AyaATS7v+gJiRGVCsj8WtAjon5tT9+KCUyO2swVNsnJBYhW9uZuzmglZrp/SymWyC3SgVcGcF8z1DH130MsD76Go5ROtVLSC1wrmnmtUc7bDb8UgVarAUUOkIMPYaBi+Z4SBGU4gXZCaLonvjo= + secure: eKPYbjg6D/MFSiZsWjVLB5pHEFCK+r4+JotTNH8YV1lhtisny4W8jaJirT+oL5qtnTuQ6dBak2Rdjw9nKm/jzKaudXNfBz4fB3Zo6rIb96nrwmxoZIcVWjblfAEQXeKY3IPRu2uDe9ryI2ZXWLJVuJId4bVikQeyPxmE4E+RJbM= on: distributions: sdist bdist_wheel repo: azavea/ashlar From 62b3c3356b47368c8f568aeffcce37577df43be0 Mon Sep 17 00:00:00 2001 From: Jean Cochrane Date: Mon, 2 Jul 2018 08:52:41 -0400 Subject: [PATCH 18/20] Try organizational PyPi credentials again --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1f9d957..c54c8d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,11 +13,11 @@ before_script: install: pip install --process-dependency-links --allow-external djsonb -e ./ script: python run_tests.py deploy: - provider: pypi - user: jeancochrane server: https://test.pypi.org/legacy/ + provider: pypi + user: azavea password: - secure: eKPYbjg6D/MFSiZsWjVLB5pHEFCK+r4+JotTNH8YV1lhtisny4W8jaJirT+oL5qtnTuQ6dBak2Rdjw9nKm/jzKaudXNfBz4fB3Zo6rIb96nrwmxoZIcVWjblfAEQXeKY3IPRu2uDe9ryI2ZXWLJVuJId4bVikQeyPxmE4E+RJbM= + secure: iP4WfDokE1JImVAw4udpnc5ZRvyXsMM4xLGWFNJ8dX13SOP5eCGXhghhKRIKOW84t1upb396+FYZX0IXO+kWlYa1Lzvry3x3fXLBQryRZtQ7Pf97e/EYn2IzjngxQ7mwg6qe2MaH4GS2cGMs9/6UYaXwqr0Ro2d0zBEQ4yV1Z8U= on: distributions: sdist bdist_wheel repo: azavea/ashlar From ed179baa0be81edffe8091d7ae6f085d3f48dbe2 Mon Sep 17 00:00:00 2001 From: Jean Cochrane Date: Mon, 2 Jul 2018 12:42:13 -0400 Subject: [PATCH 19/20] Separate deployments for deploy/master --- .travis.yml | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index c54c8d1..3e79c90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,12 +13,20 @@ before_script: install: pip install --process-dependency-links --allow-external djsonb -e ./ script: python run_tests.py deploy: - server: https://test.pypi.org/legacy/ - provider: pypi - user: azavea - password: - secure: iP4WfDokE1JImVAw4udpnc5ZRvyXsMM4xLGWFNJ8dX13SOP5eCGXhghhKRIKOW84t1upb396+FYZX0IXO+kWlYa1Lzvry3x3fXLBQryRZtQ7Pf97e/EYn2IzjngxQ7mwg6qe2MaH4GS2cGMs9/6UYaXwqr0Ro2d0zBEQ4yV1Z8U= - on: - distributions: sdist bdist_wheel - repo: azavea/ashlar - branch: pypi + - provider: pypi + user: azavea + password: + secure: iP4WfDokE1JImVAw4udpnc5ZRvyXsMM4xLGWFNJ8dX13SOP5eCGXhghhKRIKOW84t1upb396+FYZX0IXO+kWlYa1Lzvry3x3fXLBQryRZtQ7Pf97e/EYn2IzjngxQ7mwg6qe2MaH4GS2cGMs9/6UYaXwqr0Ro2d0zBEQ4yV1Z8U= + on: + distributions: sdist bdist_wheel + repo: azavea/ashlar + branch: master + - provider: pypi + server: https://test.pypi.org/legacy/ + user: azavea + password: + secure: iP4WfDokE1JImVAw4udpnc5ZRvyXsMM4xLGWFNJ8dX13SOP5eCGXhghhKRIKOW84t1upb396+FYZX0IXO+kWlYa1Lzvry3x3fXLBQryRZtQ7Pf97e/EYn2IzjngxQ7mwg6qe2MaH4GS2cGMs9/6UYaXwqr0Ro2d0zBEQ4yV1Z8U= + on: + distributions: sdist bdist_wheel + repo: azavea/ashlar + branch: develop From c9542c204770b64e267dd415e457408ab89ec5a3 Mon Sep 17 00:00:00 2001 From: Jean Cochrane Date: Mon, 2 Jul 2018 12:46:04 -0400 Subject: [PATCH 20/20] Skip existing PyPi distributions --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3e79c90..effda1f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ script: python run_tests.py deploy: - provider: pypi user: azavea + skip_existing: true password: secure: iP4WfDokE1JImVAw4udpnc5ZRvyXsMM4xLGWFNJ8dX13SOP5eCGXhghhKRIKOW84t1upb396+FYZX0IXO+kWlYa1Lzvry3x3fXLBQryRZtQ7Pf97e/EYn2IzjngxQ7mwg6qe2MaH4GS2cGMs9/6UYaXwqr0Ro2d0zBEQ4yV1Z8U= on: @@ -24,6 +25,7 @@ deploy: - provider: pypi server: https://test.pypi.org/legacy/ user: azavea + skip_existing: true password: secure: iP4WfDokE1JImVAw4udpnc5ZRvyXsMM4xLGWFNJ8dX13SOP5eCGXhghhKRIKOW84t1upb396+FYZX0IXO+kWlYa1Lzvry3x3fXLBQryRZtQ7Pf97e/EYn2IzjngxQ7mwg6qe2MaH4GS2cGMs9/6UYaXwqr0Ro2d0zBEQ4yV1Z8U= on: