Skip to content

Conversation

@Johnetordoff
Copy link
Contributor

@Johnetordoff Johnetordoff commented Mar 21, 2017

Purpose

Let MFR run later versions of setuptools (>= 31.0 setuptools)

Changes

Creates version.py file to prevent setuptools to prevent circular import.

Side Effects

None that I know of.

Ticket

https://openscience.atlassian.net/browse/SVCS-140

WB PR

CenterForOpenScience/waterbutler#201

@cslzchen cslzchen self-requested a review November 8, 2017 21:51
Copy link
Contributor

@cslzchen cslzchen left a comment

Choose a reason for hiding this comment

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

  • Update branch and fix conflicts
  • Fix imports order

Everything else looks good! 🎆

@cslzchen cslzchen changed the title Fix to allow >= 31.0 setuptools [SVCS-160] Fix to allow >= 31.0 setuptools Nov 8, 2017
@cslzchen cslzchen changed the title [SVCS-160] Fix to allow >= 31.0 setuptools [SVCS-140] Fix to allow >= 31.0 setuptools Nov 9, 2017
@@ -0,0 +1 @@
__version__ = '0.20.1'
Copy link
Contributor

Choose a reason for hiding this comment

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

@felliott this will be the file that needs manual version bump for release/hotfix
@Johnetordoff need to update this to 0.22.0

Copy link
Contributor

@cslzchen cslzchen left a comment

Choose a reason for hiding this comment

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

@Johnetordoff
I locally tested the code, here are a few issues:

  1. need to update the __version__ import in setup.py
  2. need to rebase your change up-to-date-develop and make only one commit
  3. update the version to 0.22.0 and fix conflicts

@felliott We probably need to target this for next hotfix or release since each new version will cause merge conflicts.

@cslzchen
Copy link
Contributor

And a follow-up: we should update the version of setuptools to their latest 37.0.0, which works locally for me.

@cslzchen
Copy link
Contributor

In addition, there are a few other places, for example remote_logging.py, conf.py, etc. Please take a thorough look into the code base.

@cslzchen
Copy link
Contributor

@Johnetordoff this continues in a new PR: #301 where I fixed a few minor issues and rebase all the commits into one.

@cslzchen cslzchen closed this Nov 21, 2017
felliott added a commit that referenced this pull request Mar 2, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants