Skip to content
This repository was archived by the owner on May 3, 2023. It is now read-only.

CI: Updated master #53

Merged
merged 2 commits into from
Jul 3, 2019
Merged

Conversation

TomAugspurger
Copy link
Contributor

Syncs with daily.

@TomAugspurger
Copy link
Contributor Author

I'd like to get rid of the daily branch. Does anyone know of a way to make a kind of "conditional environment variable" in travis. Basically, we have

env:
  global:
      - REPO_DIR=pandas
      # on release change this to a version
      - BUILD_COMMIT=v0.24.2

I'd like that to be

env:
  global:
      - REPO_DIR=pandas
      # on release change this to a version
      - BUILD_COMMIT="master" if $TRAVIS_EVENT_TYPE=="cron" else v0.24.2

@jreback
Copy link
Contributor

jreback commented Jul 3, 2019

@TomAugspurger why do you need that

we could just set (after released 0.25.0);

BUILD_COMMIT=master (or empty)
and dispatch on that no?

- BUILD_COMMIT=$BUILD_COMMIT;
- BUILD_DEPENDS="$NP_BUILD_DEP Cython==0.28.2"
# binary-only for cryptogrpahy. See https://github.com/pandas-dev/pandas/issues/26589
# Moto picks it up, and they don't distribute 32-bit wheels.
- TEST_DEPENDS="$NP_TEST_DEP pytest==3.8.2 pytest-xdist pytest-mock moto hypothesis wheel==0.31.1 cryptography --only-binary=cryptography"
- TEST_DEPENDS="$NP_TEST_DEP pytest>=4.0.2 pytest-xdist pytest-mock moto hypothesis>=3.58 wheel==0.31.1 cryptography --only-binary=cryptography"
Copy link
Contributor

Choose a reason for hiding this comment

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

we might need <5.0.0 here?

Copy link
Contributor

Choose a reason for hiding this comment

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

though we are not running the slow tests so not sure.

@TomAugspurger
Copy link
Contributor Author

Your comment made me realize an issue with my request. We may need different matrix items, deps, etc for the maintainace branch.

The best may be to do what you say, but make a 0.25.x branch with the 0.25.0 BUILD_COMMIT, and then bug fix releases target the 0.25.x branch. Then the mental model matches up with pandas exactly.

@jreback
Copy link
Contributor

jreback commented Jul 3, 2019

what don’t u like about the current setup?
meaning the fact that we occasionally have to sync the release branch?

@TomAugspurger
Copy link
Contributor Author

My hope was to not have daily & master drift so far apart, but I think that's unavoidable. We'll always need to have the maintenance branch (whether that's called "master" or 0.25.x) be behind.

@TomAugspurger
Copy link
Contributor Author

All green. Merging.

@TomAugspurger TomAugspurger merged commit a5a47c1 into MacPython:master Jul 3, 2019
@TomAugspurger TomAugspurger deleted the update-master branch July 3, 2019 20:28
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants