Merge branch 'main' of https://github.com/dstndstn/astrometry.net int…

…o main
dstndstn · Sep 29, 2023 · 5f94911 · 5f94911
2 parents da6b1f3 + c4b1114
commit 5f94911
Show file tree

Hide file tree

Showing 39 changed files with 307 additions and 141 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -21,13 +21,20 @@ jobs:
       - run:
           name: Python packages
           command: |
+            pip3 install wheel
             pip3 install numpy
             pip3 install fitsio
       - checkout
       - run:
           name: Make
           command: |
             export PYTHON=python3.9
+            # Permission denied?  But I'm root?
+            #ln -s /usr/include /usr/local/include/netpbm
+            ln -s /usr/include netpbm
+            ls -l netpbm/pam.h
+            export NETPBM_INC=-I$(pwd)
+            make reconfig && grep "^HAVE_NETPBM := yes" util/makefile.os-features
             make
             make py
             make extra
@@ -52,6 +59,7 @@ jobs:
             (cd /tmp && $PYTHON -c "import astrometry.util.util; print(dir(astrometry.util.util))")
             solve-field --config demo/cfg demo/apod5.jpg --continue --no-tweak --objs 60
             listhead demo/apod5.wcs
+            solve-field --config demo/cfg demo/apod5.xyls --continue --no-tweak --objs 60
 
   build-docker-ubuntu-22-py310:
     docker:
@@ -66,6 +74,7 @@ jobs:
             apt update && apt install -y apt-utils
             DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends make gcc patch git openssh-client file pkg-config wget curl swig netpbm wcslib-dev wcslib-tools zlib1g-dev libbz2-dev libcairo2-dev libcfitsio-dev libcfitsio-bin libgsl-dev libjpeg-dev libnetpbm10-dev libpng-dev python3.10-dev libpython3.10-dev ca-certificates
             DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends python3-pip
+            DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends gdb
             apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
       - run:
           name: Python packages
@@ -77,6 +86,8 @@ jobs:
           name: Make
           command: |
             export PYTHON=python3.10
+            ln -s /usr/include /usr/local/include/netpbm
+            make reconfig && grep "^HAVE_NETPBM := yes" util/makefile.os-features
             make
             make py
             make extra
@@ -101,6 +112,7 @@ jobs:
             (cd /tmp && $PYTHON -c "import astrometry.util.util; print(dir(astrometry.util.util))")
             solve-field --config demo/cfg demo/apod5.jpg --continue --no-tweak --objs 60
             listhead demo/apod5.wcs
+            solve-field --config demo/cfg demo/apod5.xyls --continue --no-tweak --objs 60
 
   build-docker-ubuntu-20-py39:
     docker:
@@ -128,6 +140,8 @@ jobs:
           name: Make
           command: |
             export PYTHON=python3.9
+            ln -s /usr/include /usr/local/include/netpbm
+            make reconfig && grep "^HAVE_NETPBM := yes" util/makefile.os-features
             make
             make py
             make extra
@@ -152,6 +166,7 @@ jobs:
             (cd /tmp && $PYTHON -c "import astrometry.util.util; print(dir(astrometry.util.util))")
             solve-field --config demo/cfg demo/apod5.jpg --continue --no-tweak --objs 60
             listhead demo/apod5.wcs
+            solve-field --config demo/cfg demo/apod5.xyls --continue --no-tweak --objs 60
 
   build-docker-ubuntu-18:
     docker:
@@ -175,6 +190,8 @@ jobs:
       - run:
           name: Make
           command: |
+            ln -s /usr/include /usr/local/include/netpbm
+            make reconfig && grep "^HAVE_NETPBM := yes" util/makefile.os-features
             make
             make py
             make extra
@@ -198,6 +215,7 @@ jobs:
             (cd /tmp && python3 -c "import astrometry.util.util; print(dir(astrometry.util.util))")
             solve-field --config demo/cfg demo/apod5.jpg --continue --no-tweak --objs 60
             listhead demo/apod5.wcs
+            solve-field --config demo/cfg demo/apod5.xyls --continue --no-tweak --objs 60
 
   build-docker-centos-8:
     docker:
@@ -232,6 +250,8 @@ jobs:
           command: |
             NETPBM_INC=-I/usr/include/netpbm
             NETPBM_LIB=-lnetpbm
+            ln -s /usr/include /usr/local/include/netpbm
+            make reconfig && grep "^HAVE_NETPBM := yes" util/makefile.os-features
             make
             make py
             make extra
@@ -254,6 +274,7 @@ jobs:
             listhead demo/apod4.wcs
             solve-field --config demo/cfg demo/apod5.jpg --continue --no-tweak --objs 60
             listhead demo/apod5.wcs
+            solve-field --config demo/cfg demo/apod5.xyls --continue --no-tweak --objs 60
 
   build-docker-centos-7:
     docker:
@@ -287,6 +308,7 @@ jobs:
           command: |
             NETPBM_INC=-I/usr/include/netpbm
             NETPBM_LIB=-lnetpbm
+            make reconfig && grep "^HAVE_NETPBM := yes" util/makefile.os-features
             make
             make py
             make extra
@@ -309,7 +331,7 @@ jobs:
             listhead demo/apod4.wcs
             solve-field --config demo/cfg demo/apod5.jpg --continue --no-tweak --objs 60
             listhead demo/apod5.wcs
-
+            solve-field --config demo/cfg demo/apod5.xyls --continue --no-tweak --objs 60
 
   build-docker-rocky-85:
     docker:
@@ -343,6 +365,7 @@ jobs:
           command: |
             export NETPBM_INC=-I/usr/include/netpbm
             export NETPBM_LIB=-lnetpbm
+            make reconfig && grep "^HAVE_NETPBM := yes" util/makefile.os-features
             make
             make py
             make extra
@@ -365,7 +388,8 @@ jobs:
             listhead demo/apod4.wcs
             solve-field --config demo/cfg demo/apod5.jpg --continue --no-tweak --objs 60
             listhead demo/apod5.wcs
-
+            solve-field --config demo/cfg demo/apod5.xyls --continue --no-tweak --objs 60
+            listhead demo/apod5.wcs
 
 workflows:
   version: 2

diff --git a/Changelog b/Changelog
@@ -1,3 +1,34 @@
+0.94:
+	Netpbm: now uses pkg-config, if available.  The code has been modified to include the "netpbm/" directory prefix, so if you set the NETPBM_INC include path manually, you will likely need to change that to drop a "netpbm" off the end.
+
+	libjpeg also now uses pkg-config.
+
+	The version string generated by the Makefile (and used by setup.py) has been changed to be PEP440 compatible when using a git checkout, eg "0.93.dev5" rather than "0.93-5-g272cc984".
+
+0.93:
+	Minor fixes to work with numpy 1.24.
+
+0.92:
+	Minor.  Change the release build so that "make py" should work without swig.  Fix some SYSTEM_GSL issues in the Makefiles.
+
+0.91:
+	Minor fixes to work with numpy 1.23.
+
+0.90:
+	Tag of convenience for LegacySurvey.org work.
+
+0.89:
+	Small fix for 32-bit platforms.
+
+0.88:
+	Don't use HUGE_VAL, to avoid issues on Mac OSX.
+
+0.87:
+	Tag of convenience for LegacySurvey.org work.
+
+0.86:
+	Fix to bright-star catalog; add libkd uint64 datatype.
+
 0.85:
 	One tiny bit of GPL v2-only code was replaced with a BSD equivalent.
 

diff --git a/Makefile b/Makefile
@@ -1,3 +1,4 @@
+
 # This file is part of the Astrometry.net suite.
 # Copyright 2006-2008 Dustin Lang, Keir Mierle and Sam Roweis.
 # Copyright 2010, 2011, 2012, 2013 Dustin Lang.
@@ -40,13 +41,26 @@ COMMON := $(BASEDIR)/util
 #          qfits-an/libqfits.a -- FITS files
 #            util/libanbase.a  -- basic stuff
 
+# Copy this stuff from makefile.common because it is needed to avoid checking
+# implicit rules for makefile.common itself!!
+$(COMMON):
+$(COMMON)/makefile.common:
+# no default rules
+.SUFFIXES :=
+# Cancel stupid implicit rules.
+%: %,v
+%: RCS/%,v
+%: RCS/%
+%: s.%
+%: SCCS/s.%
+
 include $(COMMON)/makefile.common
 
 all: subdirs version
 .PHONY: all
 
 version:
-	echo "__version__ = '$(AN_GIT_REVISION)'" > __init__.py
+	echo $(AN_GIT_REVISION) | $(AWK) -F - '{printf "__version__ = \""; if (NF>2) {printf $$1".dev"$$2} else {printf $$1}; print "\""}' > __init__.py
 .PHONY: version
 
 check: pkgconfig
@@ -236,6 +250,7 @@ release:
 	(cd $(RELEASE_DIR)/util  && swig -python -I. -I../include/astrometry util.i)
 	(cd $(RELEASE_DIR)/plot && swig -python -I. -I../util -I../include/astrometry plotstuff.i)
 	(cd $(RELEASE_DIR)/sdss  && swig -python -I. cutils.i)
+	(cd $(RELEASE_DIR)/solver && swig -python -I. -I../include/astrometry solver.i)
 	cat $(RELEASE_DIR)/util/makefile.common | sed "s/AN_GIT_REVISION .=.*/AN_GIT_REVISION := $$(git describe)/" | sed "s/AN_GIT_DATE .=.*/AN_GIT_DATE := $$(git log -n 1 --format=%cd | sed 's/ /_/g')/" > $(RELEASE_DIR)/util/makefile.common.x && mv $(RELEASE_DIR)/util/makefile.common.x $(RELEASE_DIR)/util/makefile.common
 	cat $(RELEASE_DIR)/Makefile | sed "s/RELEASE_VER .=.*/RELEASE_VER := $(RELEASE_VER)/" > $(RELEASE_DIR)/Makefile.x && mv $(RELEASE_DIR)/Makefile.x $(RELEASE_DIR)/Makefile
 	tar cf $(RELEASE_DIR).tar $(RELEASE_DIR)

diff --git a/__init__.py b/__init__.py
@@ -1 +1 @@
-__version__ = '0.91-14-g41b32a1c'
+__version__ = "0.94"
diff --git a/catalogs/Makefile b/catalogs/Makefile
@@ -8,6 +8,12 @@ DATA := .
 all:
 .PHONY: all
 
+# Detect GSL -- this minimum version was chosen to match the version in gsl-an.
+# Earlier versions would probably work fine.
+SYSTEM_GSL ?= $(shell (pkg-config --atleast-version=1.14 gsl && echo "yes") || echo "no")
+# Make this variable visible to recursive "make" calls
+export SYSTEM_GSL
+
 include $(COMMON)/makefile.common
 
 # required for build-hd-tree

diff --git a/doc/build-index.rst b/doc/build-index.rst
@@ -246,7 +246,7 @@ Finally!  The real deal.
     
           [-M]: in-memory (don't use temp files)
           [-T]: don't delete temp files
-          [-t <temp-dir>]: use this temp direcotry (default: /tmp)
+          [-t <temp-dir>]: use this temp directory (default: /tmp)
           [-v]: add verbosity.
 
 
@@ -483,7 +483,7 @@ build extra features.
 
     [-M]: in-memory (don't use temp files)
     [-T]: don't delete temp files
-    [-t <temp-dir>]: use this temp direcotry (default: /tmp)
+    [-t <temp-dir>]: use this temp directory (default: /tmp)
     [-v]: add verbosity.
 
 The help messages are all pretty self-explanatory, no?