diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ddd46a02a770f24122d00c85da2f26355e4f4b4..90759cf5497293e7657821260acd3be874a0e6c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,6 +29,8 @@ pypi: script: - python3 -m build - python3 -m twine check dist/* - - python3 -m twine upload --repository-url https://upload.pypi.org/legacy/ dist/* + #- python3 -m twine upload --repository testpypi dist/* + - python3 -m twine upload dist/* + # - python3 -m twine upload --repository-url https://upload.pypi.org/legacy/ dist/* only: - tags \ No newline at end of file diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 0000000000000000000000000000000000000000..6263c9add3729a10793442cb69453b555b3eded8 --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,22 @@ +# .readthedocs.yaml +# Read the Docs configuration file +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details + +# Required +version: 2 + +# Set the version of Python and other tools you might need +build: + os: ubuntu-22.04 + tools: + python: "3.11" + +# Build documentation in the docs/ directory with Sphinx +sphinx: + configuration: docs/conf.py + +# We recommend specifying your dependencies to enable reproducible builds: +# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html +python: + install: + - requirements: docs/rtd-pip-requirements diff --git a/.readthedocs.yml b/.readthedocs.yml deleted file mode 100644 index 312e73a26901a771aede592d750a6d9501cc7d74..0000000000000000000000000000000000000000 --- a/.readthedocs.yml +++ /dev/null @@ -1,16 +0,0 @@ -version: 2 - -build: - os: ubuntu-20.04 - tools: - python: '3.7" - -python: - install: - - method: pip - path: . - extra_requirements: - - docs - - all - -formats: [] diff --git a/README.rst b/README.rst index 1dc841947cb905e53a7a739ae22372a88f805049..9781aa9fad09c69da673ad85316d732ef56eabae 100644 --- a/README.rst +++ b/README.rst @@ -4,8 +4,8 @@ Power Spectrum This package provides functions to compute power and cross spectral density of 2D arrays. Units are properly taken into account. More information is available in the documentation, avaliable `online at readthedocs.org <http://powspec.rtfd.org>`__. .. image:: http://img.shields.io/badge/powered%20by-AstroPy-orange.svg?style=flat - :target: http://www.astropy.org - :alt: Powered by Astropy Badge + :target: http://www.astropy.org + :alt: Powered by Astropy Badge Build and coverage status ========================= @@ -20,7 +20,7 @@ Build and coverage status :target: https://zenodo.org/badge/latestdoi/259882655 - License +License ------- This project is Copyright (c) Alexandre Beelen, Mathilde Van Cuyck and licensed under diff --git a/docs/rtd-pip-requirements b/docs/rtd-pip-requirements index 25667f66372776eb16ef5b5be11337e35faa92ee..d43fe1c1e66f721f87f67bd338dcd254a5521a20 100644 --- a/docs/rtd-pip-requirements +++ b/docs/rtd-pip-requirements @@ -1,6 +1,8 @@ sphinx-gallery +sphinx-automodapi numpy scipy astropy matplotlib --e git+http://github.com/abeelen/powspec.git#egg=powspec +powspec +#-e git+http://github.com/abeelen/powspec.git#egg=powspec diff --git a/powspec/__init__.py b/powspec/__init__.py index 13a13ec1e5303985c2332fc667a050e2e9a4c933..dffc8ef5b613a9f5808c5c28f0bf6b74cd13829e 100644 --- a/powspec/__init__.py +++ b/powspec/__init__.py @@ -3,7 +3,7 @@ from .powspec import power_spectral_density, cross_spectral_density from .utils.apod import shrink_mask, fft_2d_hanning from .utils.generator import Pk, gen_pkfield -__all__ = [__version__] +__all__ = [] # Then you can be explicit to control what ends up in the namespace, __all__ += ["power_spectral_density", "cross_spectral_density"] __all__ += ["shrink_mask", "fft_2d_hanning"] diff --git a/powspec/version.py b/powspec/version.py index dc4eae777b531445b115bb59c5e710adb4f5f6f6..bc60858bd5b82e6729449cf026490830b21c8f66 100644 --- a/powspec/version.py +++ b/powspec/version.py @@ -14,4 +14,4 @@ except Exception: ) del warnings - version = '0.2.3' + version = '0.3.0'