-
Notifications
You must be signed in to change notification settings - Fork 24
Conversation
number: 0 # [not linux] | ||
number: 1 # [linux] | ||
number: 1 # [not linux] | ||
number: 2 # [linux] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now that they're both bumped, can we not just make them the same?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we bump both to release 2 then the channel would not have release 1 for OSX and Windows. It is a minor inconsistency (and I do that in the IOOS channel all the time), but that does not seems to be the way @pelson do things here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd be happy with that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done!
9eb2a5c
to
5424b2a
Compare
ed67c60
to
04b12ef
Compare
Notice the numpy build string isn't in the cartopy distribution:
Would you mind adding the necessary |
I thought that
I will make a few tests and see if I can fix that. |
|
||
if [[ $(uname) == Linux ]]; then | ||
make check | ||
fi |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NB make check fails in OSX
! We did not run check before.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For 4.9.2 as well? What is the error? We should push that up to proj.4.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For 4.9.2 as well?
Don't remember, but I had other issues building cartopy on Windows against Proj.4 4.9.2.
What is the error?
https://travis-ci.org/ioos/conda-recipes/builds/84817022
We should push that up to proj.4.
Not sure what you mean.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That build is failing with cdo, not proj.4.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep. I mixed the logs here. Let me see if I can find it. (Or better yet, remove the conditional and see if it fails again.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here is Proj 4.9.2 failure: https://travis-ci.org/ioos/conda-recipes/builds/85402318
And as soon as travis finishes we will know what happens here with proj 4.9.1
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same error: https://travis-ci.org/SciTools/conda-recipes-scitools/builds/85403903
I am removing that make check
again.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you try adding this patch?
diff --git a/src/rtodms.c b/src/rtodms.c
index 591874a..96231ff 100644
--- a/src/rtodms.c
+++ b/src/rtodms.c
@@ -63,7 +63,7 @@ rtodms(char *s, double r, int pos, int neg) {
if (*p != '.')
++p;
if (++q != p)
- (void)strcpy(p, q);
+ (void)memmove(p, q, (sign ? 3 : 2));
} else if (min)
(void)sprintf(ss,"%dd%d'%c",deg,min,sign);
else
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like it worked, so OSGeo/PROJ#317.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep that did the trick. Thanks @QuLogic.
I am trying a different approach here to get more control over the build string. I just noticed that it is gone from a few other packages too. I am not sure if the disappearance of the build string was something I changed or a conda upgrade. Right now change fad5239 produces
@pelson does Obvious-CI creates the $VER variable for numpy? Is this an approach you want to pursue? If that works and you are OK with it I can propagate that change to the other packages. |
Actually that produced all these:
I guess we just need to find a way to get rid of |
6da1c21
to
59f86ca
Compare
Yep, I'll take a look at upgrading obvious-ci for the latest conda-build. I will also update to use skip properly (see https://github.com/pelson/Obvious-CI/issues/32). |
9f485b3
to
8823179
Compare
@ocefpaf - would you mind re-basing this? |
Done! |
Just experimenting. This PR:
proj4 4.9.1
proj.4 4.9.1
)Note that the default channel does not provide version 4.9.2 of Proj4 yet.
Anyways, I am not sure if that version is OK for cartopy. See ioos/conda-recipes#500.