Merge b35e414 into 996ed29

bwinkel · Apr 17, 2019 · 9f3d417 · 9f3d417
2 parents 996ed29 + b35e414
commit 9f3d417
Show file tree

Hide file tree

Showing 16 changed files with 3,761 additions and 1,547 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,7 @@ MANIFEST
 docs/api
 docs/generated
 docs/_build
+docs/docs/_build
 
 # Eclipse editor project files
 .project

diff --git a/.travis.yml b/.travis.yml
@@ -48,7 +48,7 @@ env:
         # so Cython is required for testing. If your package does not include
         # Cython code, you can set CONDA_DEPENDENCIES=''
         # - CONDA_DEPENDENCIES='pip wheel numpy scipy pytest astropy cython h5py matplotlib pyproj sgp4 sphinx-astropy'
-        - CONDA_DEPENDENCIES='pip wheel scipy pytest cython h5py matplotlib pyproj sgp4 sphinx-astropy'
+        - CONDA_DEPENDENCIES='pip wheel scipy pytest cython h5py matplotlib pyproj<2 sgp4 sphinx-astropy'
 
         # List other runtime dependencies for the package that are available as
         # pip packages here.

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,13 @@
-0.25.9 (unreleased)
+1.0.0 (unreleased)
 =======================
 
+Bugfixes
+--------
+- `pycraf.geospatial` produced an error with newer version of `pyproj`.
+  Basically, the "+init=" part of the projection definition is now
+  deprecated. We removed this from the `pycraf.geospatial` module, but
+  as a consequence, `pyproj>=2.0` is now required. [#10]
+
 0.25.8 (2019-02-23)
 =======================