diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml deleted file mode 100644 index f0537d9..0000000 --- a/.github/workflows/CI.yml +++ /dev/null @@ -1,16 +0,0 @@ -# ============================================================== -# CI with GitHub Actions -# ============================================================== - -name: Build - -on: - - push - - pull_request - -env: - default-python: 3.9 - -jobs: - testing: - uses: quatrope/ProperImage/.github/workflows/testing.yml@1391802a2d1fc3d61693041798d6fc12a39b5a29 \ No newline at end of file diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index d935d4e..10f0738 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -4,13 +4,10 @@ name: Testing on: - workflow_call: - -# on: -# push: -# branches: [ master ] -# pull_request: -# branches: [ master ] + push: + branches: [ master ] + pull_request: + branches: [ master ] env: default-python: 3.10 diff --git a/setup.py b/setup.py index 82ddf8f..5990ea5 100644 --- a/setup.py +++ b/setup.py @@ -23,12 +23,12 @@ import os import sys -from ez_setup import use_setuptools +#from ez_setup import use_setuptools import setuptools -use_setuptools() +#use_setuptools() # ============================================================================= @@ -88,7 +88,7 @@ def do_setup(): author="Bruno Sanchez", author_email="bruno@oac.unc.edu.ar", url="https://github.com/toros-astro/ProperImage", - py_modules=["ez_setup"], + #py_modules=["ez_setup"], license="BSD 3", keywords="astronomy image", classifiers=[ @@ -99,7 +99,6 @@ def do_setup(): "Operating System :: OS Independent", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", diff --git a/tox.ini b/tox.ini index b26eee5..ea4340d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,17 +1,16 @@ - # ============================================================================= # CONF # ============================================================================= -; [gh-actions] -; python = -; 3.7: py37 -; 3.8: py38 -; 3.9: py39 -; 3.10: py310, style, docstyle, check-manifest, docs, coverage +[gh-actions] +python = + 3.7: py37 + 3.8: py38 + 3.9: py39 + 3.10: py310, style, docstyle, check-manifest, docs, coverage -; [pytest] -; addopts = -n "auto" +[pytest] +addopts = -n "auto" # ============================================================================= @@ -92,10 +91,14 @@ usedevelop = True skip_install = False changedir = docs deps = - -r {toxinidir}/docs/requirements_docs.txt + Sphinx + nbsphinx + sphinx-autobuild + sphinx-rtd-theme commands = sphinx-build -W -b html -d {envtmpdir}/doctrees source {envtmpdir}/html +; -r {toxinidir}/docs/requirements_docs.txt [testenv:docstyle] deps = @@ -110,4 +113,4 @@ skip_install = True usedevelop = False deps = check-manifest commands = - check-manifest \ No newline at end of file + check-manifest