Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docker and Cloudbuild fixes #1074

Merged
merged 48 commits into from
Jan 31, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
93065c8
Updating docker files for both normal services and for tests. This wi…
wtgee Jan 27, 2021
e4ed10f
* Remove unused env file.
wtgee Jan 27, 2021
873738d
* Small cleanup to rpi file.
wtgee Jan 27, 2021
37eb9a6
* Updates to testing config.
wtgee Jan 27, 2021
fb0fd47
* Remove `PANLOG` references and default to `./logs` for logger.
wtgee Jan 27, 2021
15d884a
* docker-compose service cleaner with env file.
wtgee Jan 27, 2021
3b8547b
* Update tests index files.
wtgee Jan 28, 2021
2bfff50
* Updates to GHA tests.
wtgee Jan 28, 2021
b5edf4e
* Remove old entrypoint script.
wtgee Jan 28, 2021
e6d196c
* Minor clean ups, especially some of the dependencies.
wtgee Jan 28, 2021
62e6edf
* Cleaning up help scripts. (will replace).
wtgee Jan 28, 2021
9a39b63
* Don't install astrometry indexes for now.
wtgee Jan 28, 2021
c71eb4c
* Fix imports for mount removed by auto-ide
wtgee Jan 28, 2021
2457915
* Update README.
wtgee Jan 28, 2021
c391a3d
* Updated compose file before removal.
wtgee Jan 28, 2021
a092064
* Remove docker-compose file.
wtgee Jan 28, 2021
9fa52f6
* Setting up GHA actions.
wtgee Jan 28, 2021
222fc18
* More log dir fixing.
wtgee Jan 28, 2021
7f13e1f
* Simplify the install script.
wtgee Jan 28, 2021
a0c1343
* GHA testing dirs.
wtgee Jan 28, 2021
fba87e9
* Add index files.
wtgee Jan 28, 2021
aad48a6
* The testing docker image has the 2mass index files to solve the sma…
wtgee Jan 28, 2021
3b60a89
* Slight formatting update.
wtgee Jan 28, 2021
d712c92
* Simplify compose file for testing.
wtgee Jan 28, 2021
389b14f
* Specific astrometry index file for tests.
wtgee Jan 28, 2021
a647354
* Require python>=3.8 (already building that inside docker images).
wtgee Jan 28, 2021
3dda4fa
* Fix imags.
wtgee Jan 29, 2021
5a6e02e
* Fix tests.
wtgee Jan 29, 2021
e80c4d5
* Default (i.e. example) config improved.
wtgee Jan 30, 2021
4a44b0e
* Adding back zsh to the install script.
wtgee Jan 30, 2021
c00a447
* Ignore any local conf files.
wtgee Jan 30, 2021
86c4946
* Simulator load script actually loads simulator.
wtgee Jan 30, 2021
b18f01a
* Move items out of the rpi `user-data` cloud-init file and into inst…
wtgee Jan 30, 2021
d4048b7
* Pass the test data to the Docker image so can be used by the simula…
wtgee Jan 30, 2021
670b27d
* GHA flake test bumped to python 3.8
wtgee Jan 30, 2021
fb80945
* Adding docker compose file for starting services.
wtgee Jan 30, 2021
011fbc5
* Updated changelog.
wtgee Jan 30, 2021
5ccf40d
* Updated changelog.
wtgee Jan 30, 2021
92f0a31
* Adding missing base class properties to simulator.
wtgee Jan 30, 2021
fe132b9
* Adding `threading.excepthook` to try and catch threading errors.
wtgee Jan 30, 2021
4b4e409
* Adding `threading.excepthook` to log threading errors.
wtgee Jan 30, 2021
585ac1e
* Adding `threading.excepthook` to log threading errors.
wtgee Jan 31, 2021
6520b80
* Testing files need 2mass, not tycho2 index.
wtgee Jan 31, 2021
bc4ddd7
* Pass the radius to `Images.solve_field` otherwise it was defaulting…
wtgee Jan 31, 2021
be558ee
* Default the solve `radius` to 15°.
wtgee Jan 31, 2021
209afe5
Typo fix.
wtgee Jan 31, 2021
657884f
Minor cleanup.
wtgee Jan 31, 2021
2f86d64
* With autocorrection of pointing.
wtgee Jan 31, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ logs/
notebooks
examples
docs
build
coverage.xml

# Build and docs folder/files
Expand Down
9 changes: 6 additions & 3 deletions .gcloudignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
venv

# See note in .dockerignore about the git folder.
.git
!.git
.github

*.md
Expand All @@ -21,5 +21,8 @@ logs/
notebooks
examples
docs
build
coverage.xml

# Build and docs folder/files
build/*
dist/*
sdist/*
14 changes: 7 additions & 7 deletions .github/workflows/pythontest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ 3.7 ]
python-version: [ 3.8 ]
steps:
- name: Checkout code
uses: actions/checkout@v2
Expand All @@ -19,24 +19,24 @@ jobs:
pip install flake8
# stop the build if there are Python syntax errors or undefined names
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
# exit-zero treats all errors as warnings.
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=100 --statistics
test:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ 3.7 ]
python-version: [ 3.8 ]
steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Build panoptes-pocs image
run: |
docker-compose -f tests/docker-compose.yaml --env-file tests/env build
- name: Test with pytest in panoptes-pocs container
run: |
docker-compose -f tests/docker-compose.yaml build
mkdir -p logs && chmod -R 777 logs
mkdir -p build && chmod -R 777 build
docker-compose -f tests/docker-compose.yaml --env-file tests/env run pocs pytest
- name: Test with pytest in panoptes-pocs container
run: |
docker-compose -f tests/docker-compose.yaml up
- name: Upload coverage report to codecov.io
uses: codecov/codecov-action@v1
if: success()
Expand Down
28 changes: 14 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,31 +24,31 @@ tags

# Package files
*.egg
*.eggs/
*.eggs
.installed.cfg
*.egg-info

# Unittest and coverage
htmlcov/*
.coverage
htmlcov
.tox
junit.xml
coverage.xml
.coverage.*
.pytest_cache/
.coverage*
.pytest_cache
cover

# Build and docs folder/files
build/*
dist/*
sdist/*
docs/api/*
docs/_rst/*
docs/_build/*
cover/*
build
dist
sdist
docs/api
docs/_rst
docs/_build
MANIFEST

# Per-project virtualenvs
.venv*/
**/.ipynb_checkpoints/**
.venv*
.ipynb_checkpoints

logs
conf_files/*_local.yaml
217 changes: 0 additions & 217 deletions .style.yapf

This file was deleted.

38 changes: 37 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,58 @@
Changelog
=========

[0.7.dev8]
[0.7.8dev]
----------

Generic
~~~~~~~

* **Breaking changes** #1074

* Python 3.8
* Default service install does not include ``focuser`` dependencies.
* Default Docker command is a ``ipython`` console with the simulators loaded.
* Docker image only contains limited set of files.
* Directories inside the service image have been simplified for easier mapping onto desired targets on the host. The main top-level directory (i.e. ``$PANDIR``) is now ``/POCS`` with other folders nested underneath.
* Removing ``peas`` scripts.

Added
~~~~~

* Simple example script for creating a ``POCS`` instance with all simulators. #1074
* Using ``threading.excepthook`` to log errors in camera exposure threads. #1074

Changed
~~~~~~~

* Updated install script (includes ZSH again). #1074
* Pointing state is skipped if ``num_pointing_images==0`. #1074
* The default ``radius`` for solving images is 15°.

Docker
~~~~~~

* ``PANUSER`` owns ``conda``. #1068
* Dockerfile cleanup for better builds. #1068
* Docker image does not contain ``focuser`` extras by default. #1068
* Images use ``gcr.io/panoptes-exp/panoptes-utils`` as base. #1074
* Docker files are all contained within ``docker`` folder. #1074
* Docker image has tycho2 10-19 index files for plate-solving. #1074
* Docker services (``config-server`` and ``pocs-control``) are started in ``global`` mode so tehre can be only one. # 1074
* Config changed to run with simulators out of the box. #1074

Removing
~~~~~~~~

* Old scripts and config files. #1074

Testing
~~~~~~~

* Fix the log level in conftest. #1068
* Move all tests into ``tests`` subdir from project root. #1068
* Cleanup of testing setup, especially for GHA. #1068
* Simplify testing service by removing ``tests/env`` file. #1074

[0.7.7] - 2021-01-19
--------------------
Expand Down
Loading