Skip to content

Commit

Permalink
Merge pull request #258 from cdeil/rm-healpix
Browse files Browse the repository at this point in the history
Remove astropy-healpix
  • Loading branch information
cdeil committed May 22, 2019
2 parents 79faa3c + 33e6466 commit acb4b47
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
- checkout
- run:
name: Install dependencies
command: /opt/python/cp36-cp36m/bin/pip install numpy scipy astropy pytest-astropy pytest-xdist Cython jinja2 astropy-healpix
command: /opt/python/cp36-cp36m/bin/pip install numpy scipy astropy pytest-astropy pytest-xdist Cython jinja2
- run:
name: Run tests
command: PYTHONHASHSEED=42 /opt/python/cp36-cp36m/bin/python setup.py test --parallel=4
4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ env:
- ASTROPY_VERSION=stable
- SETUP_CMD='test'
- MAIN_CMD='python setup.py'
# Add the current dev version of astropy-healpix waiting for the
# new release to support Python 3.7.
# Cython is necessary for pip installing the dev version of astropy-healpix.
- PIP_DEPENDENCIES='Cython git+http://github.com/astropy/astropy-healpix.git#egg=astropy-healpix'
- CONDA_DEPENDENCIES='Cython shapely pytest-arraydiff'
- CONDA_CHANNELS='astropy'
- SETUP_XVFB=True
Expand Down
1 change: 0 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ environment:
# For this package-template, we include examples of Cython modules,
# so Cython is required for testing. If your package does not include
# Cython code, you can set PIP_DEPENDENCIES='' and CONDA_DEPENDENCIES=''
PIP_DEPENDENCIES: 'Cython git+http://github.com/astropy/astropy-healpix.git#egg=astropy-healpix'
CONDA_CHANNELS: "defaults conda-forge astropy"
CONDA_DEPENDENCIES: "Cython pytest-arraydiff pytest=3.6.4"
ASTROPY_USE_SYSTEM_PYTEST: 1
Expand Down
1 change: 0 additions & 1 deletion regions/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
try:
PYTEST_HEADER_MODULES['Cython'] = 'Cython' # noqa
PYTEST_HEADER_MODULES['Astropy'] = 'astropy' # noqa
PYTEST_HEADER_MODULES['Astropy-healpix'] = 'astropy_healpix' # noqa
del PYTEST_HEADER_MODULES['h5py'] # noqa
del PYTEST_HEADER_MODULES['Pandas'] # noqa
except (NameError, KeyError): # NameError is needed to support Astropy < 1.0
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
description=DESCRIPTION,
scripts=scripts,
setup_requires=['numpy'],
install_requires=['numpy', 'astropy', 'astropy-healpix', 'six'],
install_requires=['numpy', 'astropy', 'six'],
extras_require=dict(
plot=[
'matplotlib',
Expand Down

0 comments on commit acb4b47

Please sign in to comment.