Closed dkirkby closed 8 years ago
Following the experience gained on dkirkby/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.
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
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...
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...
Note that the commented-out line in the travis config has a typo astropy/package-template#193
All tests are passing now, so make it official with a PR.
See changelog here.