From a120837f49b39c6e1d9e9d23634ac0cf8be15b5e Mon Sep 17 00:00:00 2001 From: David Hoffman Date: Mon, 8 Apr 2024 13:56:35 -0700 Subject: [PATCH] another version fix --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/make_release.yml | 13 ++++++------- pyotf/__init__.py | 5 ----- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 91ddd03..e33df1c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,10 +22,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up Python 3.11 + - name: Set up Python 3.10 uses: actions/setup-python@v5 with: - python-version: 3.11 + python-version: '3.10' - name: Install dependencies run: | python -m pip install --upgrade pip @@ -52,7 +52,7 @@ jobs: strategy: matrix: os: [macos-latest, windows-latest, ubuntu-latest] - python-version: [3.11] + python-version: ['3.10'] steps: - uses: actions/checkout@v4 @@ -69,6 +69,6 @@ jobs: pip install -r requirements.txt # install package pip install . - - name: Test with pytest + name: Test with pytest run: | pytest --doctest-modules pyotf/ tests/ diff --git a/.github/workflows/make_release.yml b/.github/workflows/make_release.yml index ad602d9..4c68d33 100644 --- a/.github/workflows/make_release.yml +++ b/.github/workflows/make_release.yml @@ -2,7 +2,7 @@ on: push: # Sequence of patterns matched against refs/tags tags: - - "v*" # Push events to matching v*, i.e. v1.0, v20.15.10 + - "*.*.*" # Push events to matching semver versioning name: Create Release @@ -10,14 +10,14 @@ jobs: build: name: Create Release runs-on: ubuntu-latest - if: github.repository == 'david-hoffman/pyotf' + if: github.repository == 'david-hoffman/dphtools' steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Install Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: '3.10' - name: Install Dependencies run: | python -m pip install --upgrade pip @@ -25,7 +25,6 @@ jobs: - name: build run: | python setup.py sdist bdist_wheel - # actions/create-release@latest is no longer maintained. # - name: Create Release # id: create_release # uses: actions/create-release@latest @@ -54,4 +53,4 @@ jobs: uses: maxibor/conda-package-publish-action@v1.1 with: subDir: "conda.recipe" - AnacondaToken: ${{ secrets.ANACONDA_TOKEN }} + AnacondaToken: ${{ secrets.ANACONDA_TOKEN }} \ No newline at end of file diff --git a/pyotf/__init__.py b/pyotf/__init__.py index 55a3b0a..b1955b2 100644 --- a/pyotf/__init__.py +++ b/pyotf/__init__.py @@ -11,11 +11,6 @@ Copyright (c) 2016, David Hoffman """ -from ._version import get_versions - -__version__ = get_versions()["version"] -del get_versions - from . import _version __version__ = _version.get_versions()["version"]