Merge pull request #41 from nabobalis/master

Overhaul of package underneath for python3 only

.circleci/config.yml

@@ -12,33 +12,44 @@ docs-install: &docs-install
 version: 2
 jobs:
 
-  egg-info-27:
+  egg-info-36:
     docker:
-      - image: circleci/python:2.7
+      - image: circleci/python:3.6
     steps:
       - checkout
       - run: python setup.py egg_info
 
-  egg-info-35:
+  egg-info-37:
     docker:
-      - image: circleci/python:3.5
+      - image: circleci/python:3.7
     steps:
       - checkout
       - run: python setup.py egg_info
 
-  egg-info-36:
+  twine-check:
     docker:
-      - image: circleci/python:3.6
+      - image: circleci/python:3.7
     steps:
       - checkout
-      - run: python setup.py egg_info
+      - run: python setup.py sdist
+      - run: python -m pip install -U --user --force-reinstall twine
+      - run: python -m twine check dist/*
 
-  egg-info-37:
+  pip-install:
     docker:
-      - image: circleci/python:3.7
+      - image: continuumio/miniconda3
     steps:
       - checkout
-      - run: python setup.py egg_info
+      - run: *apt-install
+      - run:
+          name: Update pip
+          command: pip install -U pip
+      - run:
+          name: Install Ablog
+          command: |
+            pip install --progress-bar off .[all]
+            pip install -e .[all]
+            python setup.py develop
 
   html-docs:
     docker:
@@ -48,6 +59,7 @@ jobs:
       - checkout
       - run: *apt-install
       - run: *docs-install
+      - run: pip install -e .[all]
       - run: python setup.py build_sphinx
       - store_artifacts:
           path: build/sphinx/html/
@@ -61,11 +73,14 @@ workflows:
 
   egg-info:
     jobs:
-      - egg-info-27
-      - egg-info-35
       - egg-info-36
       - egg-info-37
 
+  misc:
+    jobs:
+      - twine-check
+      - pip-install
+
   documentation:
     jobs:
       - html-docs

.github/workflows/release.yml

@@ -0,0 +1,26 @@
+on: release
+name: Release to PyPi
+jobs:
+  tag-filter:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: tag-filter
+      uses: actions/bin/filter@master
+      with:
+        args: tag
+    - name: check
+      uses: ross/python-actions/setup-py/3.7@master
+      with:
+        args: check
+    - name: sdist
+      uses: ross/python-actions/setup-py/3.7@master
+      with:
+        args: sdist
+    - name: upload
+      uses: ross/python-actions/twine@master
+      env:
+        TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
+        TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
+      with:
+        args: upload ./dist/sunpy-sphinx-theme-*.tar.gz

.gitignore

@@ -1,23 +1,228 @@
+### Python: https://raw.githubusercontent.com/github/gitignore/master/Python.gitignore
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
-MANIFEST
-docs/manual/.ipynb_checkpoints/*
+*$py.class
+
+# C extensions
+*.so
 
 # Distribution / packaging
+.Python
+pip-wheel-metadata/
 build/
+develop-eggs/
 dist/
-demo/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
 *.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+junit/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
 
 # Sphinx documentation
-docs/_*
-docs/.*
-docs/tmp/
-docs/api/
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+
+### https://raw.github.com/github/gitignore/master/Global/OSX.gitignore
 
 .DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must ends with two \r.
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+
+### Linux: https://raw.githubusercontent.com/github/gitignore/master/Global/Linux.gitignore
 
 *~
-.vscode
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### MacOS: https://raw.githubusercontent.com/github/gitignore/master/Global/macOS.gitignore
+
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### Windows: https://raw.githubusercontent.com/github/gitignore/master/Global/Windows.gitignore
+
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+### VScode: https://raw.githubusercontent.com/github/gitignore/master/Global/VisualStudioCode.gitignore
+.vscode/*
+
+### Extra Python Items and SunPy Specific
+.hypothesis
+.pytest_cache
+sunpydata.sqlite
+sunpydata.sqlite-journal
+sunpy/_compiler.c
+sunpy/cython_version.py
+docs/_build
+docs/generated
+docs/api/
+docs/whatsnew/latest_changelog.txt
+examples/**/*.asdf
+# This is incase you run the figure tests
+figure_test_images*
+tags
+
+### Pycharm(?)
+.idea
+
+# Release script
+.github_cache
+
+docs/_build/
+docs/.doctrees/
+docs/_website/
+docs/_latex/
 test/

.travis.yml

@@ -11,18 +11,11 @@ sudo: false
 
 env:
   matrix:
-    - PYTHON_VERSION=2.7 SPHINX_VERSION=1.6
-    - PYTHON_VERSION=2.7 SPHINX_VERSION=1.8
+    - PYTHON_VERSION=3.6 SPHINX_VERSION=2.0
+    - PYTHON_VERSION=3.6 SPHINX_VERSION=2.1
 
-    - PYTHON_VERSION=3.5 SPHINX_VERSION=1.6
-    - PYTHON_VERSION=3.5 SPHINX_VERSION=1.8
-
-    - PYTHON_VERSION=3.6 SPHINX_VERSION=1.6
-    - PYTHON_VERSION=3.6 SPHINX_VERSION=1.8
-
-    - PYTHON_VERSION=3.7 SPHINX_VERSION=1.6
-    - PYTHON_VERSION=3.7 SPHINX_VERSION=1.7
-    - PYTHON_VERSION=3.7 SPHINX_VERSION=1.8
+    - PYTHON_VERSION=3.7 SPHINX_VERSION=2.0
+    - PYTHON_VERSION=3.7 SPHINX_VERSION=2.1
 
   global:
     - LOCALE=default
@@ -33,7 +26,7 @@ env:
 install:
     - git clone git://github.com/astropy/ci-helpers.git
     - source ci-helpers/travis/setup_conda.sh
-    - pip install -e .
+    - pip install -e .[all]
 
 script:
     - make tests

MANIFEST.in

@@ -1,6 +1,8 @@
 include README.rst
 include LICENSE.rst
 include setup.py
+include setup.cfg
+include pyproject.toml
 include ablog/*.py
 include ablog/templates/*.html
 include ablog/locale/sphinx.pot