Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Panoptes PAN002 authored and Panoptes PAN002 committed Jul 28, 2016
2 parents fbd6dc2 + 92d37bd commit cc9a411
Show file tree
Hide file tree
Showing 123 changed files with 11,815 additions and 234 deletions.
78 changes: 76 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,76 @@
*.pyc
*/*.pyc
# PANOPTES specific files
config_local.yaml

# Development support
sftp-config.json

# emacs backups
*~
\#*\#

# TeX products
*.aux
*.log
*.pdf
*.toc

# Compiled files
*.py[co]
*.a
*.o
*.so
__pycache__

# Ignore .c files by default to avoid including generated code. If you want to
# add a non-generated .c extension, use `git add -f filename.c`.
*.c

# Other generated files
_build
*/cython_version.py
htmlcov
.coverage
MANIFEST

# Sphinx
docs/api
docs/_build

# Eclipse editor project files
.project
.pydevproject
.settings

# Pycharm editor project files
.idea

# Packages/installer info
*.egg
*.egg-info
dist
build
eggs
parts
var
sdist
develop-eggs
.installed.cfg
distribute-*.tar.gz

# Other
.*.swp

# Mac OSX
.DS_Store

# Eclipse project files
.settings
.project
.pydevproject

# Ignore IPython notebook (Jupyter) checkpoints.
.ipynb_checkpoints
notebooks/*

# Ignore link to weather_plots in web/static/
weather_plots
File renamed without changes.
13 changes: 13 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
language: python
python:
- "3.2"
- "3.3"
- "3.4"
- "3.5"
- "3.5-dev" # 3.5 development branch
- "nightly" # currently points to 3.6-dev
# command to install dependencies
install: "pip install -r requirements.txt"
# command to run tests
# script: nosetests
script: python setup.py test
File renamed without changes.
21 changes: 21 additions & 0 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2014-2016 PANOPTES

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
22 changes: 22 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
include README.rst
include CHANGES.rst

include ez_setup.py
include ah_bootstrap.py
include setup.cfg

recursive-include *.pyx *.c *.pxd
recursive-include docs *
recursive-include licenses *
recursive-include cextern *
recursive-include scripts *

prune build
prune docs/_build
prune docs/api

recursive-include astropy_helpers *
exclude astropy_helpers/.git
exclude astropy_helpers/.gitignore

global-exclude *.pyc *.o
167 changes: 0 additions & 167 deletions OCS_notes.md

This file was deleted.

16 changes: 13 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
POCS
====
Welcome to POCS's documentation!
================================
<img src="http://projectpanoptes.org/v1/wp-content/uploads/2013/02/System_view21.png" alt="PANOPTES prototype unit on Mauna Loa" style="border: 1px solid;" />

Panoptes Observatory Control System
[PANOPTES](http://projectpanoptes.org) is an open source citizen science project that is designed to find exoplanets with digital cameras. The goal of PANOPTES is to establish a global network of of robotic cameras run by amateur astronomers and schools in order to monitor, as continuously as possible, a very large number of stars. For more general information about the project, including the science case and resources for interested individuals, see the [project overview](http://projectpanoptes.org/v1/overview/).


POCS (PANOPTES Observatory Control System) is the main software driver for the PANOPTES unit, responsible for high-level control of the unit.

Links
-----

- PANOPTES Homepage: http://projectpanoptes.org
- Source Code: http://github.com/panoptes/POCS
Loading

0 comments on commit cc9a411

Please sign in to comment.