diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 3abacc7..e954e94 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -8,7 +8,7 @@ on: branches: - "package-*" tags: - - "package-*" + - "v*" release: types: - published @@ -48,6 +48,7 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 + fetch-tags: true - name: Build wheels uses: pypa/cibuildwheel@v2.20.0 @@ -58,11 +59,15 @@ jobs: CIBW_ARCHS: ${{ matrix.buildplat[2] }} CIBW_BUILD_VERBOSITY: 1 + - name: git status + run: | + git status + - name: upload artifacts if: | - (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/package')) || + (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')) || (github.event_name == 'release' && github.event.action == 'published') - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: path: wheelhouse/*.whl retention-days: 7 @@ -79,15 +84,16 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 + fetch-tags: true - name: Build sdist run: pipx run build --sdist - name: upload artifacts if: | - (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/package')) || + (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')) || (github.event_name == 'release' && github.event.action == 'published') - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: path: dist/*.tar.gz retention-days: 7 @@ -95,7 +101,7 @@ jobs: upload_testpypi_lipyds: if: | github.repository == 'lilyminium/lipyds' && - (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/package')) + (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')) name: testpypi_upload_lipyds environment: name: deploy @@ -105,7 +111,7 @@ jobs: runs-on: ubuntu-latest needs: [build_wheels, build_sdist] steps: - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v3 with: name: artifact path: dist @@ -129,7 +135,7 @@ jobs: runs-on: ubuntu-latest needs: [build_wheels, build_sdist] steps: - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v3 with: name: artifact path: dist @@ -140,7 +146,7 @@ jobs: check_testpypi: if: | github.repository == 'lilyminium/lipyds' && - (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/package')) + (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')) name: testpypi check runs-on: ${{ matrix.os }} timeout-minutes: 60 diff --git a/.gitignore b/.gitignore index dab45e5..d4aedc0 100644 --- a/.gitignore +++ b/.gitignore @@ -25,8 +25,9 @@ wheels/ *.egg-info/ .installed.cfg *.egg -*.cpp *.xtc_offsets.npz +wheelhouse/ +*.whl # PyInstaller # Usually these files are written by a python script from a template diff --git a/MANIFEST.in b/MANIFEST.in index 900fcff..e23d010 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,6 @@ global-include *.pyx global-include *.pxd -global-include *.c +global-include *.cpp global-include *.h global-include *.cpp recursive-include doc * diff --git a/pyproject.toml b/pyproject.toml index 1f73c22..bdb2322 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -51,7 +51,7 @@ testpaths = [ [tool.versioningit.vcs] method = "git" -match = ["package-*"] +match = ["v*"] default-tag = "0.0.0" [tool.versioningit.format] @@ -59,9 +59,3 @@ default-tag = "0.0.0" distance = "{base_version}+{distance}.{vcs}{rev}" dirty = "{base_version}+{distance}.{vcs}{rev}.dirty" distance-dirty = "{base_version}+{distance}.{vcs}{rev}.dirty" - -[tool.versioningit.write] -file = "lipyds/_version.py" - -[tool.versioningit.tag2version] -rmprefix = "package-" \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index 663e791..57e7972 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,13 +18,5 @@ USE_TABS = False # Flake8, PyFlakes, etc max-line-length = 119 -[versioneer] -# Automatic version numbering scheme -VCS = git -style = pep440 -versionfile_source = lipyds/_version.py -versionfile_build = lipyds/_version.py -tag_prefix = v - [aliases] test = pytest diff --git a/setup.py b/setup.py index 6710bdf..6b27516 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ from distutils.ccompiler import new_compiler from distutils.sysconfig import customize_compiler -RELEASE = "0.0.2-dev" +RELEASE = "0.0.1" is_release = 'dev' not in RELEASE