diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 439d4435d7c93..186f6cf0c5d17 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -48,7 +48,7 @@ # Testing /tests/helpers/boring_model.py @williamfalcon @tchaton @borda -/.github/CODEOWNERS @williamfalcon -/README.md @williamfalcon @edenlightning @borda -/setup.py @williamfalcon @borda -/pytorch_lightning/info.py @williamfalcon @borda +/.github/CODEOWNERS @williamfalcon +/README.md @williamfalcon @edenlightning @borda +/setup.py @williamfalcon @borda +/pytorch_lightning/__info__.py @williamfalcon @borda diff --git a/.github/prepare-nightly_version.py b/.github/prepare-nightly_version.py index 61710e73d69fd..57f1c51e6e95b 100644 --- a/.github/prepare-nightly_version.py +++ b/.github/prepare-nightly_version.py @@ -4,15 +4,15 @@ # set paths _PATH_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) -_PATH_INIT = os.path.join(_PATH_ROOT, 'pytorch_lightning', '__init__.py') +_PATH_INFO = os.path.join(_PATH_ROOT, 'pytorch_lightning', '__info__.py') # get today date now = datetime.datetime.now() now_date = now.strftime("%Y%m%d") -print(f"prepare init '{_PATH_INIT}' - replace version by {now_date}") -with open(_PATH_INIT, 'r') as fp: +print(f"prepare init '{_PATH_INFO}' - replace version by {now_date}") +with open(_PATH_INFO, 'r') as fp: init = fp.read() init = re.sub(r'__version__ = [\d\.\w\'"]+', f'__version__ = "{now_date}"', init) -with open(_PATH_INIT, 'w') as fp: +with open(_PATH_INFO, 'w') as fp: fp.write(init) diff --git a/docs/source/conf.py b/docs/source/conf.py index 68a33c709ef91..237ba2515d36f 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -28,11 +28,11 @@ SPHINX_MOCK_REQUIREMENTS = int(os.environ.get('SPHINX_MOCK_REQUIREMENTS', True)) try: - from pytorch_lightning import info + from pytorch_lightning import __info__ as info except ImportError: # alternative https://stackoverflow.com/a/67692/4521646 sys.path.append(os.path.join(PATH_ROOT, "pytorch_lightning")) - import info + import __info__ as info # -- Project documents ------------------------------------------------------- diff --git a/pytorch_lightning/info.py b/pytorch_lightning/__info__.py similarity index 98% rename from pytorch_lightning/info.py rename to pytorch_lightning/__info__.py index 7e179940d2168..c2fbab022db07 100644 --- a/pytorch_lightning/info.py +++ b/pytorch_lightning/__info__.py @@ -1,7 +1,7 @@ import time _this_year = time.strftime("%Y") -__version__ = '1.3.0rc0' +__version__ = '1.3.0rc1' __author__ = 'William Falcon et al.' __author_email__ = 'waf2107@columbia.edu' __license__ = 'Apache-2.0' diff --git a/pytorch_lightning/__init__.py b/pytorch_lightning/__init__.py index b9660475bf2f7..46ad8ec52f7fe 100644 --- a/pytorch_lightning/__init__.py +++ b/pytorch_lightning/__init__.py @@ -3,7 +3,7 @@ import logging import os -from pytorch_lightning.info import ( # noqa: F401 +from pytorch_lightning.__info__ import ( # noqa: F401 __author__, __author_email__, __copyright__, diff --git a/setup.py b/setup.py index 0979de8ce9065..ef45a108918aa 100755 --- a/setup.py +++ b/setup.py @@ -21,11 +21,11 @@ from setuptools import find_packages, setup try: - from pytorch_lightning import info, setup_tools + from pytorch_lightning import __info__ as info, setup_tools except ImportError: # alternative https://stackoverflow.com/a/67692/4521646 sys.path.append("pytorch_lightning") - import info + import __info__ as info import setup_tools # https://packaging.python.org/guides/single-sourcing-package-version/