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

Propagate changes to astropy affiliated package template #42

Closed
dkirkby opened this issue Jun 23, 2016 · 6 comments
Closed

Propagate changes to astropy affiliated package template #42

dkirkby opened this issue Jun 23, 2016 · 6 comments
Assignees
Milestone

Comments

@dkirkby
Copy link
Member

dkirkby commented Jun 23, 2016

See changelog here.

@dkirkby
Copy link
Member Author

dkirkby commented Aug 23, 2016

Following the experience gained on desihub/speclite#18 and working on a new branch:

git fetch template  # I should have added --no-tags here
git merge template/master

results in:

Auto-merging specsim/conftest.py
Auto-merging specsim/__init__.py
CONFLICT (content): Merge conflict in specsim/__init__.py
Auto-merging setup.py
CONFLICT (modify/delete): TEMPLATE_CHANGES.md deleted in HEAD and modified in template/master. Version template/master of TEMPLATE_CHANGES.md left in tree.
Auto-merging README.rst
CONFLICT (content): Merge conflict in README.rst
Auto-merging MANIFEST.in
Auto-merging .travis.yml
CONFLICT (content): Merge conflict in .travis.yml
Auto-merging .gitignore
Automatic merge failed; fix conflicts and then commit the result.

@dkirkby
Copy link
Member Author

dkirkby commented Aug 23, 2016

Use HEAD for: specsim/__init__.py, README.rst

Edit to resolve conflicts for: .travis.yml

Stage the changes:

git rm -rf packagename
git rm TEMPLATE_CHANGES.md
git add .travis.yml README.rst specsim/__init__.py
git add astropy_helpers

Clean up tags (because I forgot the --no-tags option to fetch above):

git tag -d v0.4.1 v1.0 v1.1 v1.1.1 v1.1.2

Commit and push:

git commit -m 'Update to latest astropy affiliated package template'
git push --set-upstream upstream update_astropy_template

@dkirkby
Copy link
Member Author

dkirkby commented Aug 23, 2016

A bunch of unit tests of the transform module are failing now with:

AstropyWarning: failed to download http://maia.usno.navy.mil/ser7/finals2000A.all,
using local IERS-B: An attempt was made to connect to the internet by a test that
was not marked `remote_data`.

Try adding the @remote_data decorator to each failing test and re-run tests...

@dkirkby
Copy link
Member Author

dkirkby commented Aug 23, 2016

There are still two testing environments failing with apparent version incompatibilities. These are the only two versions that use astropy lts.

The py27 environment fails with:

The following specifications were found to be in conflict:
  - astropy 1.0* -> numpy 1.10*|1.9*
  - astropy 1.0* -> python 2.6*|3.3*|3.4*|3.5*
  - python 2.7*

The py35 environment fails with:

The following specifications were found to be in conflict:
  - astropy 1.0* -> numpy 1.10*|1.9*
  - astropy 1.0* -> python 2.6*|2.7*|3.3*|3.4*
  - python 3.5*

I noticed that the updated travis config has a comment:

        # Conda packages for affiliated packages are hosted in channel
        # "astropy" while builds for astropy LTS with recent numpy versions
        # are in astropy-ci-extras. If your package uses either of these,
        # add the channels to CONDA_CHANNELS along with any other channels
        # you want to use.
        # - CONDA_CHANNELS='astopy-ci-extras astropy'

I would have expected this to be un-commented by default since tests against LTS are included, but try setting CONDA_CHANNELS='astropy-ci-extras' and re-running the tests...

@dkirkby
Copy link
Member Author

dkirkby commented Aug 23, 2016

Note that the commented-out line in the travis config has a typo astropy/package-template#193

@dkirkby
Copy link
Member Author

dkirkby commented Aug 23, 2016

All tests are passing now, so make it official with a PR.

@dkirkby dkirkby added this to the v0.5 milestone Aug 23, 2016
@dkirkby dkirkby self-assigned this Aug 23, 2016
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

No branches or pull requests

1 participant