Skip to content
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

Jump to bottom

bump build number #148

Merged
merged 5 commits into from
Sep 25, 2019
Merged

bump build number #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ebe4a68
bump build number
ocefpaf Sep 12, 2019
c7c7f0c
skip gdal 3 on win for now
ocefpaf Sep 12, 2019
2f56930
MNT: Re-rendered with conda-build 3.18.9, conda-smithy 3.4.6, and con…
ocefpaf Sep 12, 2019
9e16f7b
update gdal
ocefpaf Sep 25, 2019
ef470c2
let conda handle version
ocefpaf Sep 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 4 additions & 12 deletions .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 0 additions & 24 deletions .ci_support/win_c_compilervs2015cxx_compilervs2015libgdal3.0python3.6.yaml
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions .ci_support/win_c_compilervs2015cxx_compilervs2015libgdal3.0python3.7.yaml
View file
Open in desktop

This file was deleted.

0 ...xx_compilervs2015libgdal2.4python3.6.yaml → ...lervs2015cxx_compilervs2015python3.6.yaml
View file
Open in desktop
File renamed without changes.
0 ...xx_compilervs2015libgdal2.4python3.7.yaml → ...lervs2015cxx_compilervs2015python3.7.yaml
View file
Open in desktop
File renamed without changes.
22 changes: 4 additions & 18 deletions README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion recipe/bld.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
:: There is no `gdal-config` on Windows so we need to hardcode gdal's version.
set GDAL_VERSION=2.4.1
set GDAL_VERSION=2.4.2

"%PYTHON%" -m pip install --no-deps --ignore-installed . ^
--global-option=build_ext ^
Expand Down
6 changes: 3 additions & 3 deletions recipe/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
libgdal:
- 2.4
- 3.0
zipped_keys:
- libgdal
- 3.0 # [not win]
zipped_keys: # [not win]
- libgdal # [not win]
6 changes: 3 additions & 3 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ source:
sha256: fac0ad17590520e5808338798c0cc425b635ae068571513f76b679015f2ee665

build:
number: 0
number: 1
skip: True # [win and py27]
entry_points:
- rio = rasterio.rio.main:main_group
Expand All @@ -23,11 +23,11 @@ requirements:
- pip
- cython
- numpy
- libgdal {{ libgdal }}
- libgdal
run:
- python
- setuptools >=0.9.8
- libgdal {{ libgdal }}
- libgdal
- affine >=1.3.0
- attrs >=16.0.0
- click >=4,<8
Expand Down