From 1a25234011ee4c086b8e280c85e01a1ab1f0f24f Mon Sep 17 00:00:00 2001 From: Wei Ji Date: Sat, 12 Oct 2019 10:00:44 +1300 Subject: [PATCH 1/3] Rename requirements.txt to conda-requirements.txt The requirements.txt file is a standard file used by pip to install Python packages, and it is confusing to use it for installing conda packages. --- .azure-pipelines.yml | 4 ++-- .travis.yml | 4 ++-- MAINTENANCE.md | 4 ++-- requirements-dev.txt => conda-requirements-dev.txt | 0 requirements.txt => conda-requirements.txt | 0 5 files changed, 6 insertions(+), 6 deletions(-) rename requirements-dev.txt => conda-requirements-dev.txt (100%) rename requirements.txt => conda-requirements.txt (100%) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index fd8d655c161..4d6c7d69dc4 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -74,8 +74,8 @@ jobs: vmImage: 'macOS-10.14' variables: - CONDA_REQUIREMENTS: requirements.txt - CONDA_REQUIREMENTS_DEV: requirements-dev.txt + CONDA_REQUIREMENTS: conda-requirements.txt + CONDA_REQUIREMENTS_DEV: conda-requirements-dev.txt CONDA_INSTALL_EXTRA: "codecov" CONDA_EXTRA_CHANNEL: "conda-forge/label/dev" diff --git a/.travis.yml b/.travis.yml index 3c7d5835371..bbc3026f976 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,8 +24,8 @@ env: - secure: "md4fgPt9RC/sCoN5//5PcNHLUd9gWQGewV5hFpWW88MRTjxTng1Zfs8r7SqlF2AkEEepFfyzq0BEe9c3FMAnFbec3KmqdlQen4V8xDbLrcTlvkPlTrYGbAScUvdhhqojB//hMHoTD4KvxAv9CiUwFBO4hCMmj2buWHUbV9Ksu5WCW9mF/gkt/hIuYAU6Mbwt8PiYyMgUpzMHO1vruofcWRaVnvKwmBqHB0ae86D4/drpwn4CWjlM12WUnphT2bssiyPkw24FZtCN6kPVta6bLZKBxu0bZpw2vbXuUG+Yh19Q4mp8wNYT3XSHJf8Hl5LfujF48+cLWu+6rlCkdcelyVylhWLFc3rGOONAv4G8jWW2yNSz/bLQfJnMpd81fQEu5eySmFxB7mdB0uyKpvIG1jMJQ73LlYKakKLAPdYhMFyQAHoX9gvCE3S4QR95DBMi5gM/pZubOCcMLdjPHB5JKpJHSjxbOzyVwgmsUIEgd5Bi2vZvvYQXn1plk4xpQ3PhXc+/gi33bzY89mKcfOn0HJ2pD1vLqDXRCBsMCakoLZ0JB/6bacaz4FngbsGWuQ+I1cz20lJGL/MSi9bW1G7Uoidt3GXXWDmXrWt70vIXlLIxr8XV0Mu/rPbauGgWE+ZSYEfvdM5sP+FNF7vQ5de+Fkvzg5Z3tTfR+O1W+d7+vM4=" - TWINE_USERNAME=Leonardo.Uieda # The file with the listed requirements to be installed by conda - - CONDA_REQUIREMENTS=requirements.txt - - CONDA_REQUIREMENTS_DEV=requirements-dev.txt + - CONDA_REQUIREMENTS=conda-requirements.txt + - CONDA_REQUIREMENTS_DEV=conda-requirements-dev.txt - CONDA_INSTALL_EXTRA="codecov twine" # Enable the development channel so we can get GMT 6.0.0 before it's released - CONDA_EXTRA_CHANNEL=conda-forge/label/dev diff --git a/MAINTENANCE.md b/MAINTENANCE.md index 1cafdac8f98..ff101cfdd3c 100644 --- a/MAINTENANCE.md +++ b/MAINTENANCE.md @@ -43,8 +43,8 @@ The main advantages of this are: We use TravisCI continuous integration (CI) services to build and test the project on Linux, and Mac (Windows is still a work in progress). The configuration file for this service is `.travis.yml`. -It relies on the `requirements.txt` file to install the required dependencies using -conda and the `Makefile` to run the tests and checks. +It relies on the `conda-requirements.txt` file to install the required dependencies +using conda and the `Makefile` to run the tests and checks. Travis also handles all of our deployments automatically: diff --git a/requirements-dev.txt b/conda-requirements-dev.txt similarity index 100% rename from requirements-dev.txt rename to conda-requirements-dev.txt diff --git a/requirements.txt b/conda-requirements.txt similarity index 100% rename from requirements.txt rename to conda-requirements.txt From acfecfd48901246218317ab5ccaf74d976db9c86 Mon Sep 17 00:00:00 2001 From: Wei Ji Date: Sat, 12 Oct 2019 13:46:06 +1300 Subject: [PATCH 2/3] Place gmt as extra requirement in continuous integration scripts Move the conda gmt=6.0.0rc4 requirement from requirement.txt to the CONDA_INSTALL_EXTRA environment variable in our Travis and Azure build scripts. --- .azure-pipelines.yml | 2 +- .travis.yml | 2 +- conda-requirements.txt | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 4d6c7d69dc4..85af912740c 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -76,7 +76,7 @@ jobs: variables: CONDA_REQUIREMENTS: conda-requirements.txt CONDA_REQUIREMENTS_DEV: conda-requirements-dev.txt - CONDA_INSTALL_EXTRA: "codecov" + CONDA_INSTALL_EXTRA: "codecov gmt=6.0.0rc4" CONDA_EXTRA_CHANNEL: "conda-forge/label/dev" strategy: diff --git a/.travis.yml b/.travis.yml index bbc3026f976..f3fd78f31a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ env: # The file with the listed requirements to be installed by conda - CONDA_REQUIREMENTS=conda-requirements.txt - CONDA_REQUIREMENTS_DEV=conda-requirements-dev.txt - - CONDA_INSTALL_EXTRA="codecov twine" + - CONDA_INSTALL_EXTRA="codecov twine gmt=6.0.0rc4" # Enable the development channel so we can get GMT 6.0.0 before it's released - CONDA_EXTRA_CHANNEL=conda-forge/label/dev # These variables control which actions are performed in a build diff --git a/conda-requirements.txt b/conda-requirements.txt index f5ba5f87988..7d82cb1dd8f 100644 --- a/conda-requirements.txt +++ b/conda-requirements.txt @@ -1,5 +1,4 @@ # Requirements for installing with conda -gmt=6.0.0rc4 numpy pandas xarray From b526368c21cc7ff544c3664d5cedc324e316f727 Mon Sep 17 00:00:00 2001 From: Wei Ji Date: Sat, 12 Oct 2019 13:51:47 +1300 Subject: [PATCH 3/3] Rename conda-requirements.txt back to requirements.txt --- .azure-pipelines.yml | 4 ++-- .travis.yml | 4 ++-- MAINTENANCE.md | 4 ++-- conda-requirements-dev.txt => requirements-dev.txt | 0 conda-requirements.txt => requirements.txt | 0 5 files changed, 6 insertions(+), 6 deletions(-) rename conda-requirements-dev.txt => requirements-dev.txt (100%) rename conda-requirements.txt => requirements.txt (100%) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 85af912740c..e865f595d51 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -74,8 +74,8 @@ jobs: vmImage: 'macOS-10.14' variables: - CONDA_REQUIREMENTS: conda-requirements.txt - CONDA_REQUIREMENTS_DEV: conda-requirements-dev.txt + CONDA_REQUIREMENTS: requirements.txt + CONDA_REQUIREMENTS_DEV: requirements-dev.txt CONDA_INSTALL_EXTRA: "codecov gmt=6.0.0rc4" CONDA_EXTRA_CHANNEL: "conda-forge/label/dev" diff --git a/.travis.yml b/.travis.yml index f3fd78f31a6..06ff0cc97f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,8 +24,8 @@ env: - secure: "md4fgPt9RC/sCoN5//5PcNHLUd9gWQGewV5hFpWW88MRTjxTng1Zfs8r7SqlF2AkEEepFfyzq0BEe9c3FMAnFbec3KmqdlQen4V8xDbLrcTlvkPlTrYGbAScUvdhhqojB//hMHoTD4KvxAv9CiUwFBO4hCMmj2buWHUbV9Ksu5WCW9mF/gkt/hIuYAU6Mbwt8PiYyMgUpzMHO1vruofcWRaVnvKwmBqHB0ae86D4/drpwn4CWjlM12WUnphT2bssiyPkw24FZtCN6kPVta6bLZKBxu0bZpw2vbXuUG+Yh19Q4mp8wNYT3XSHJf8Hl5LfujF48+cLWu+6rlCkdcelyVylhWLFc3rGOONAv4G8jWW2yNSz/bLQfJnMpd81fQEu5eySmFxB7mdB0uyKpvIG1jMJQ73LlYKakKLAPdYhMFyQAHoX9gvCE3S4QR95DBMi5gM/pZubOCcMLdjPHB5JKpJHSjxbOzyVwgmsUIEgd5Bi2vZvvYQXn1plk4xpQ3PhXc+/gi33bzY89mKcfOn0HJ2pD1vLqDXRCBsMCakoLZ0JB/6bacaz4FngbsGWuQ+I1cz20lJGL/MSi9bW1G7Uoidt3GXXWDmXrWt70vIXlLIxr8XV0Mu/rPbauGgWE+ZSYEfvdM5sP+FNF7vQ5de+Fkvzg5Z3tTfR+O1W+d7+vM4=" - TWINE_USERNAME=Leonardo.Uieda # The file with the listed requirements to be installed by conda - - CONDA_REQUIREMENTS=conda-requirements.txt - - CONDA_REQUIREMENTS_DEV=conda-requirements-dev.txt + - CONDA_REQUIREMENTS=requirements.txt + - CONDA_REQUIREMENTS_DEV=requirements-dev.txt - CONDA_INSTALL_EXTRA="codecov twine gmt=6.0.0rc4" # Enable the development channel so we can get GMT 6.0.0 before it's released - CONDA_EXTRA_CHANNEL=conda-forge/label/dev diff --git a/MAINTENANCE.md b/MAINTENANCE.md index ff101cfdd3c..1cafdac8f98 100644 --- a/MAINTENANCE.md +++ b/MAINTENANCE.md @@ -43,8 +43,8 @@ The main advantages of this are: We use TravisCI continuous integration (CI) services to build and test the project on Linux, and Mac (Windows is still a work in progress). The configuration file for this service is `.travis.yml`. -It relies on the `conda-requirements.txt` file to install the required dependencies -using conda and the `Makefile` to run the tests and checks. +It relies on the `requirements.txt` file to install the required dependencies using +conda and the `Makefile` to run the tests and checks. Travis also handles all of our deployments automatically: diff --git a/conda-requirements-dev.txt b/requirements-dev.txt similarity index 100% rename from conda-requirements-dev.txt rename to requirements-dev.txt diff --git a/conda-requirements.txt b/requirements.txt similarity index 100% rename from conda-requirements.txt rename to requirements.txt