Commit 6c09de7d authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Updated .gitlab-ci.yml. Updated README.

parent b1b14e58
Pipeline #1685 failed
......@@ -123,26 +123,21 @@ deploy_anaconda:
stage: deploy
dependencies:
- test_py_tools_ds
#- deploy_pypi
- deploy_pypi
script:
- source /root/miniconda3/bin/activate
- conda install -y -q conda-build anaconda-client
- yum install -y patch # https://stackoverflow.com/questions/40392161/building-conda-skeleton-from-pypi-package-throws-error
# - conda skeleton pypi py_tools_ds --output-dir public/conda.recipe/py_tools_ds # create recipe
- conda config --set anaconda_upload yes # enable auto-upload to anaconda
#- anaconda logout
#- anaconda login --username ${ANACONDA_USER} --password ${ANACONDA_PASSWORD}
# - conda build -c conda-forge -c defaults --token ${ANACONDA_TOKEN} --py=3.6 conda_recipe/meta.yaml
# - conda build -c conda-forge -c defaults --token ${ANACONDA_TOKEN} --py=2.7 conda_recipe/meta.yaml
- conda build -c conda-forge -c defaults --token ${ANACONDA_TOKEN} conda_recipe/meta.yaml
# - conda build -c conda-forge --token ${ANACONDA_TOKEN} public/conda.recipe/py_tools_ds # --output returns package name
# - conda build -c conda-forge --token ${ANACONDA_TOKEN} --python 3.6 --python 3.5 --python 3.4 --python 2.7 public/conda.recipe/py_tools_ds # --output returns package name
#- conda convert --platform all /home/jsmith/miniconda/conda-bld/linux-64/pyinstrument-0.13.1-py27_0.tar.bz2
#-o outputdir/
- conda build -c conda-forge -c defaults --token ${ANACONDA_TOKEN} conda_recipe/meta.yaml # --output returns package name
# - conda convert --platform all /home/jsmith/miniconda/conda-bld/linux-64/pyinstrument-0.13.1-py27_0.tar.bz2
# -o outputdir/
- anaconda logout
only:
- feature/conda_deployment
#- /^v\d+\.\d+\.\d+([abc]\d*)?$/ # PEP-440 compliant version (tags)
# - feature/conda_deployment
- /^v\d+\.\d+\.\d+([abc]\d*)?$/ # PEP-440 compliant version (tags)
except:
- dev
......
......@@ -53,12 +53,14 @@ routine. However, for some projects, we strongly recommend resolving the depende
is run. This approach avoids problems with conflicting versions of the same software.
Using conda_, the recommended approach is:
*via conda + pip*
.. code-block:: console
# create virtual environment for py_tools_ds, this is optional
conda create -y -q --name py_tools_ds python=3
source activate py_tools_ds
conda install -y -q -c conda-forge numpy gdal scikit-image pyproj rasterio shapely pandas
conda install -c conda-forge numpy gdal scikit-image pyproj rasterio shapely pandas
* To install py_tools_ds, use the pip installer:
......@@ -66,6 +68,16 @@ Using conda_, the recommended approach is:
pip install py_tools_ds
*via conda channel*
.. code-block:: console
# create virtual environment for py_tools_ds, this is optional
conda create -y -q --name py_tools_ds python=3
source activate py_tools_ds
conda install -c danschef -c conda-forge -c defaults py_tools_ds
Credits
-------
......
# it uses load_setup_py_data from conda_build.jinja_context to populate some fields
# uses load_setup_py_data from conda_build.jinja_context to populate some fields
# with values fed from setuptools.
{% set data = load_setup_py_data() %}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment