diff --git a/.appveyor.yml b/.appveyor.yml index b0c27df3..6db78e1a 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -37,7 +37,7 @@ build: off # Turning off Test Script for now test_script: - - sharppy examples/data/14061619.OAX +# - sharppy examples/data/14061619.OAX - pytest -v before_deploy: diff --git a/.travis.yml b/.travis.yml index 7f1eb946..0dd37e51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,18 +53,6 @@ deploy: repo: sharppy/SHARPpy tags: true branch: andover -# Deploy the code to PyPI - - provider: pypi - user: sharppy - password: - secure: "qgE7Hef6m9m6xf0CU976z/7KbpSaRIeucwVztsJQQCqP97FMnkb0bL0fhQMoxkVti1VCAuF9FXvWzWBKuKeu+sqP3pEE7GYlTVqq4kN3W55DleVFbyWy3Fyhu+6pRJL168kZg1rCNboX7Xw8RwI0l0r3DiSvjqWSYvOfdabgYlECImS4XjxRYxN2GTDXG3D37soWiBbi7rqDj33fitUHXyJMLdPhtbGs85BStG9Op2aRXibtCH2Lo/EtY7PkWaxY8F5aXrKiufHPvkpow8S2XKD1VdWpHAV+5lO7ai9N8Z9zyogYLzIAfPqHDx6afQWUknRBn8Ot7k4Kt3cBGEhdvtAH8jhZGCmqDPsk1+qgx/OyWK9iiJsvsJWKmTf286AZl5vxO9NH1fZL0LpYQ5XvwrVi83eygLttEOU0I6ggngflJfs5KvfZXmvODdfK4oVzn3mJODbncLoYz1KxNZRPUFWycmkDaPmy2YyPjRnqE1S6SOP1zGVAEO2Leq/lGbB0J18b103oehyp6+t9KnpsoEhPDsr68xKCkKLl5QXVlfGikHJAMVI/CM0Hh8bva6bTNP5Ulsko6vYyvfGlbI0rEW3OJikvh0051M0lS175j3LMGj5Bs1iFZX43KoyebcfqYDtRQdrvigzsRAZoR9BdBAnVZtO5mfFMkrUtIX94Au8=" - distributions: sdist bdist_wheel - upload_docs: no - on: - repo: sharppy/SHARPpy - tags: true - branch: andover - condition: "$BUILD_CONDA = YES" # Deploy code to conda - provider: script script: bash ci/deploy_conda.sh @@ -81,3 +69,16 @@ deploy: tags: true branch: andover condition: "$BUILD_DOCS = YES" +# Deploy the code to PyPI + - provider: pypi + user: sharppy + password: + secure: "qgE7Hef6m9m6xf0CU976z/7KbpSaRIeucwVztsJQQCqP97FMnkb0bL0fhQMoxkVti1VCAuF9FXvWzWBKuKeu+sqP3pEE7GYlTVqq4kN3W55DleVFbyWy3Fyhu+6pRJL168kZg1rCNboX7Xw8RwI0l0r3DiSvjqWSYvOfdabgYlECImS4XjxRYxN2GTDXG3D37soWiBbi7rqDj33fitUHXyJMLdPhtbGs85BStG9Op2aRXibtCH2Lo/EtY7PkWaxY8F5aXrKiufHPvkpow8S2XKD1VdWpHAV+5lO7ai9N8Z9zyogYLzIAfPqHDx6afQWUknRBn8Ot7k4Kt3cBGEhdvtAH8jhZGCmqDPsk1+qgx/OyWK9iiJsvsJWKmTf286AZl5vxO9NH1fZL0LpYQ5XvwrVi83eygLttEOU0I6ggngflJfs5KvfZXmvODdfK4oVzn3mJODbncLoYz1KxNZRPUFWycmkDaPmy2YyPjRnqE1S6SOP1zGVAEO2Leq/lGbB0J18b103oehyp6+t9KnpsoEhPDsr68xKCkKLl5QXVlfGikHJAMVI/CM0Hh8bva6bTNP5Ulsko6vYyvfGlbI0rEW3OJikvh0051M0lS175j3LMGj5Bs1iFZX43KoyebcfqYDtRQdrvigzsRAZoR9BdBAnVZtO5mfFMkrUtIX94Au8=" + distributions: sdist bdist_wheel + upload_docs: no + on: + repo: sharppy/SHARPpy + tags: true + branch: andover-off + condition: "$BUILD_CONDA = YES" + diff --git a/ci/build_docs.sh b/ci/build_docs.sh index d34e9523..f68ec8b4 100644 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -3,8 +3,8 @@ # https://github.com/pydata/pandas set -e +echo "Installing sphinx, etc. to build the documentation ..." cd "$TRAVIS_BUILD_DIR" -cd ci/ if [[ "$BUILD_DOCS" == "YES" ]]; then conda install -q -c sphinx sphinx-gallery; conda install -q -c anaconda sphinx_rtd_theme @@ -13,6 +13,8 @@ else exit 0 fi +echo "Adding the SSH key ..." +cd ci/ openssl aes-256-cbc -K $encrypted_08ee84f00b5d_key -iv $encrypted_08ee84f00b5d_iv -in deploy_key.enc -out deploy_key -d chmod 600 deploy_key eval `ssh-agent -s` @@ -25,11 +27,13 @@ echo "Building Docs" cd docs # Move the license and other stuff to the docs folder +echo "Copying over some of the files to be included in the documentation ..." cp ../LICENSE.rst ../docs/source/license.rst cp ../CONTRIBUTING.rst ../docs/source/contributing.rst cp ../CHANGELOG.rst ../docs/source/changelog.rst # Run sphinx +echo "Running Sphinx ..." make html # upload to pyart-docs-travis repo is this is not a pull request and diff --git a/setup.py b/setup.py index be565509..4733944f 100644 --- a/setup.py +++ b/setup.py @@ -29,14 +29,15 @@ "databases/shapefiles/*", "../rc/*"],} include_package_data = True -install_requires = ['python-dateutil', 'requests', 'numpy==1.15.*'] +install_requires = [] +#install_requires = ['python-dateutil', 'requests', 'numpy==1.15.*'] # Because pip doesn't recognize it when PySide is installed by conda from conda-forge # Try to import PySide. If it fails, add the PySide to the install_requires -try: - import PySide - print("Success importing PySide") -except: - install_requires.append("PySide==1.2.*") +#try: +# import PySide +# print("Success importing PySide") +#except: +# install_requires.append("PySide==1.2.*") entry_pts = {"console_scripts": ['sharppy = runsharp.full_gui:main'] } # Create some directory variables to shorten the lines.