Skip to content

Update to v0.1.10 #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 10, 2020
Merged

Update to v0.1.10 #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88ff247
Update conda recipe
xylar Jul 8, 2020
f373939
Update package version to 0.1.10
xylar Jul 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/versions.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Documentation On GitHub
`v0.1.7`_ `0.1.7`_
`v0.1.8`_ `0.1.8`_
`v0.1.9`_ `0.1.9`_
`v0.1.10`_ `0.1.10`_
================ ===============

.. _`stable`: ../stable/index.html
Expand All @@ -18,3 +19,5 @@ Documentation On GitHub
.. _`0.1.8`: https://github.com/MPAS-Dev/geometric_features/tree/0.1.8
.. _`v0.1.9`: ../0.1.9/index.html
.. _`0.1.9`: https://github.com/MPAS-Dev/geometric_features/tree/0.1.9
.. _`v0.1.10`: ../0.1.10/index.html
.. _`0.1.10`: https://github.com/MPAS-Dev/geometric_features/tree/0.1.10
2 changes: 1 addition & 1 deletion geometric_features/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
from geometric_features.feature_collection import FeatureCollection, \
read_feature_collection

__version_info__ = (0, 1, 9)
__version_info__ = (0, 1, 10)
__version__ = '.'.join(str(vi) for vi in __version_info__)
30 changes: 13 additions & 17 deletions recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
#!/usr/bin/env bash

echo $with_data

$PYTHON -m pip install . --no-deps -vv

if [ "$with_data" == "True" ]; then
cp -r "${SRC_DIR}/geometric_data" "${PREFIX}/share/geometric_data"
cp -r "${SRC_DIR}/geometric_data" "${PREFIX}/share/geometric_data"

ACTIVATE_DIR="${PREFIX}/etc/conda/activate.d"
DEACTIVATE_DIR="${PREFIX}/etc/conda/deactivate.d"
mkdir -p "${ACTIVATE_DIR}"
mkdir -p "${DEACTIVATE_DIR}"
ACTIVATE_DIR="${PREFIX}/etc/conda/activate.d"
DEACTIVATE_DIR="${PREFIX}/etc/conda/deactivate.d"
mkdir -p "${ACTIVATE_DIR}"
mkdir -p "${DEACTIVATE_DIR}"

cp "${RECIPE_DIR}/scripts/activate.sh" "${ACTIVATE_DIR}/geometric_features-activate.sh"
cp "${RECIPE_DIR}/scripts/deactivate.sh" "${DEACTIVATE_DIR}/geometric_features-deactivate.sh"
cp "${RECIPE_DIR}/scripts/activate.csh" "${ACTIVATE_DIR}/geometric_features-activate.csh"
cp "${RECIPE_DIR}/scripts/deactivate.csh" "${DEACTIVATE_DIR}/geometric_features-deactivate.csh"
cp "${RECIPE_DIR}/scripts/activate.fish" "${ACTIVATE_DIR}/geometric_features-activate.fish"
cp "${RECIPE_DIR}/scripts/deactivate.fish" "${DEACTIVATE_DIR}/geometric_features-deactivate.fish"
cp "${RECIPE_DIR}/scripts/activate.bat" "${ACTIVATE_DIR}/geometric_features-activate.bat"
cp "${RECIPE_DIR}/scripts/deactivate.bat" "${DEACTIVATE_DIR}/geometric_features-deactivate.bat"
fi
cp "${RECIPE_DIR}/scripts/activate.sh" "${ACTIVATE_DIR}/geometric_features-activate.sh"
cp "${RECIPE_DIR}/scripts/deactivate.sh" "${DEACTIVATE_DIR}/geometric_features-deactivate.sh"
cp "${RECIPE_DIR}/scripts/activate.csh" "${ACTIVATE_DIR}/geometric_features-activate.csh"
cp "${RECIPE_DIR}/scripts/deactivate.csh" "${DEACTIVATE_DIR}/geometric_features-deactivate.csh"
cp "${RECIPE_DIR}/scripts/activate.fish" "${ACTIVATE_DIR}/geometric_features-activate.fish"
cp "${RECIPE_DIR}/scripts/deactivate.fish" "${DEACTIVATE_DIR}/geometric_features-deactivate.fish"
cp "${RECIPE_DIR}/scripts/activate.bat" "${ACTIVATE_DIR}/geometric_features-activate.bat"
cp "${RECIPE_DIR}/scripts/deactivate.bat" "${DEACTIVATE_DIR}/geometric_features-deactivate.bat"
3 changes: 0 additions & 3 deletions recipe/conda_build_config.yaml
View file
Open in desktop

This file was deleted.

24 changes: 3 additions & 21 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
{% set name = "geometric_features" %}
{% set version = "0.1.9" %}
{% set version = "0.1.10" %}
{% set build = 0 %}

{% if with_data != "True" %}
# prioritize no data via build number
{% set build = build + 100 %}
{% endif %}

package:
name: {{ name|lower }}
version: {{ version }}
Expand All @@ -17,19 +12,6 @@ source:
build:
number: {{ build }}
noarch: python

{% if with_data == "True" %}
{% set data_prefix = "with_data" %}
{% else %}
{% set data_prefix = "no_data" %}
{% endif %}
# add build string so packages can depend on
# with_data or no_data variants
# dependencies:
# `PKG_NAME * no_data*` for no geometric data included
# `PKG_NAME * with_data*` for all geometric data included
string: "{{ data_prefix }}_py_h{{ PKG_HASH }}_{{ build }}"

entry_points:
- combine_features = geometric_features.__main__:combine_features
- difference_features = geometric_features.__main__:difference_features
Expand Down Expand Up @@ -74,10 +56,10 @@ test:

about:
home: https://github.com/MPAS-Dev/geometric_features
license: BSD 3-Clause
license: BSD-3-Clause
license_family: BSD
license_file: LICENSE
summary: 'Tools for manipulating collections of geojson geometric features'
summary: Tools for manipulating collections of geojson geometric features
description: |
Tools for manipulating regions, transects, and points in geojson format
for use in initializing climate models and analyzing their output.
Expand Down