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.

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

V2.0.0 #14

Merged
merged 2 commits into from
May 22, 2018
Merged

V2.0.0 #14

merged 2 commits into from
May 22, 2018

Conversation

ocefpaf
Copy link
Member

@ocefpaf ocefpaf commented May 21, 2018

This will probably fail and we'll need to work on it a little bit to smooth out the corners.

Ping @pelson

@conda-forge-linter
Copy link

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe) and found it was in an excellent condition.

@ocefpaf
Copy link
Member Author

ocefpaf commented May 21, 2018

@pelson I guess that the tarball is missing something, no?

@pelson
Copy link
Member

pelson commented May 21, 2018

Change looks good. Something is well borked though. I'll double check what's going on...

@ocefpaf
Copy link
Member Author

ocefpaf commented May 21, 2018

Change looks good. Something is well borked though. I'll double check what's going on...

The PyPI tarball is mising the .pyd file. I changed it here to use the GitHub tarball now and sent a PR to cf_units that hopefully fixes this. See SciTools/cf-units#104

@pelson
Copy link
Member

pelson commented May 21, 2018

Confirming I get the same thing locally 😞

@pelson
Copy link
Member

pelson commented May 21, 2018

Let's go for cf_units v2.0.1 😉
https://pypi.org/project/cf_units/

@ocefpaf
Copy link
Member Author

ocefpaf commented May 21, 2018

Windows is still failing but I have a hunch that is due udunits2 fault and not cf_units. See https://ci.appveyor.com/project/conda-forge/cf-units-feedstock/build/1.0.31/job/9efx4k73a0plladl

recipe/build.sh Outdated
@@ -1,9 +1,7 @@
#!/bin/bash

# Make sure cf_units can find the udunits library.
SITECFG=cf_units/etc/site.cfg
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I recon we can remove the site.cfg file for Linux & OSX.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left it there for "symmetry" no strong opinions and glad to remove it.

@pelson
Copy link
Member

pelson commented May 22, 2018

Setting the environment variable UDUNITS2_XML_PATH should have an impact on whether the tests pass. This wouldn't normally be necessary, but there is a bug with the UDUINTS build, as described at conda-forge/udunits2-feedstock#18.

Don't think we need to hold up this PR to fix that issue, if we can get the tests passing using the UDUNITS2_XML_PATH env var (with a comment referencing the issue, so that we know when we can remove the restriction).

@ocefpaf
Copy link
Member Author

ocefpaf commented May 22, 2018

Don't think we need to hold up this PR to fix that issue, if we can get the tests passing using the UDUNITS2_XML_PATH

Testing that now. If the env var works I'll fix udunits2 feedstock with an activate and deactivate script like the one we have for *nix.


Edit: I never committed the scripts solution 😳 It was rotting in a branch.
Just sent conda-forge/udunits2-feedstock#19 to implement that for *nix and Windows.

@ocefpaf
Copy link
Member Author

ocefpaf commented May 22, 2018

Working on a version of udunits2 2.2.25 vc9 with the same scripts now, so we can have cf_units on Python 2.7+Win too.

@ocefpaf ocefpaf merged commit f1c9fbc into conda-forge:master May 22, 2018
@ocefpaf ocefpaf deleted the v2.0.0 branch May 22, 2018 17:43
set SITECFG=cf_units/etc/site.cfg
echo [System] > %SITECFG%
echo udunits2_path = %SCRIPTS%\udunits2.dll >> %SITECFG%
echo udunits2_xml_path = %LIBRARY_PREFIX%\share\udunits\udunits2.xml >> %SITECFG%
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Personally, I'd have kept this, as it helps cf_units work even if users don't activate their environment.
That said, I'm not overly concerned about it 😄

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense. I can re-add that in another PR later. I guess I was confused due to your comment on this line for Linux and OS X before. Should I re-add build.sh and bld.bat with the cf_units/etc/site.cfg and the udunits2.xml path on both?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, confusing messages. conda does the binary replacement just fine for OSX and Linux, just not for Windows. Happy to have the config file for all platforms though for consistency.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem.

@pelson
Copy link
Member

pelson commented May 22, 2018

Awesome stuff @ocefpaf!!

@ocefpaf ocefpaf mentioned this pull request May 22, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants