diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 3331b8792..1d1f2c121 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -9,9 +9,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.11 diff --git a/.github/workflows/downstream_test.yml b/.github/workflows/downstream_test.yml index bd582f99e..2545875a1 100644 --- a/.github/workflows/downstream_test.yml +++ b/.github/workflows/downstream_test.yml @@ -10,9 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.9 - name: Install dependencies diff --git a/.github/workflows/full_test.yml b/.github/workflows/full_test.yml index 601da8b2e..3eda9b3f0 100644 --- a/.github/workflows/full_test.yml +++ b/.github/workflows/full_test.yml @@ -20,13 +20,13 @@ jobs: python-version: [3.9, "3.12"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: chartboost/ruff-action@v1 # Fail fast if there are any linting errors with: version: 0.6.2 # consistent with pyproject.toml ? src: mikeio # ignore notebooks - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -44,3 +44,13 @@ jobs: run: make doctest - name: Static type check run: make typecheck + - name: Build package + run: | + pip install build wheel twine + python -m build + + - name: Upload build artifact + uses: actions/upload-artifact@v4 + with: + name: dist-${{matrix.os}}-${{matrix.python-version}} + path: dist/* diff --git a/.github/workflows/legacy_test.yml b/.github/workflows/legacy_test.yml index df10ac375..d8eece050 100644 --- a/.github/workflows/legacy_test.yml +++ b/.github/workflows/legacy_test.yml @@ -13,9 +13,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.9 diff --git a/.github/workflows/notebooks_test.yml b/.github/workflows/notebooks_test.yml index c3d37128c..ff6ee147b 100644 --- a/.github/workflows/notebooks_test.yml +++ b/.github/workflows/notebooks_test.yml @@ -14,9 +14,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.9' - name: Install mikeio diff --git a/.github/workflows/perf_test.yml b/.github/workflows/perf_test.yml index 1b39e73cf..9bd61290e 100644 --- a/.github/workflows/perf_test.yml +++ b/.github/workflows/perf_test.yml @@ -17,9 +17,9 @@ jobs: python-version: ["3.10"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index c6b0174ba..e011f10ad 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -18,9 +18,9 @@ jobs: steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.10' - name: Install dependencies diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index 27ca010fe..000000000 --- a/MANIFEST.in +++ /dev/null @@ -1,2 +0,0 @@ -graft mikeio/bin -include License.txt diff --git a/Makefile b/Makefile index e670e4be4..5e6693da0 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,12 @@ LIB = mikeio -LIB = mikeio - check: lint typecheck test build: typecheck test python -m build lint: - ruff check mikeio + ruff check $(LIB)/ format: ruff format $(LIB)/ diff --git a/mikeio/__init__.py b/mikeio/__init__.py index c483450ca..2259317e2 100644 --- a/mikeio/__init__.py +++ b/mikeio/__init__.py @@ -21,9 +21,9 @@ # 'X.Y.dev0' is the canonical version of 'X.Y.dev' # -__version__ = "2.1.0" # TODO use git hash instead for dev version? +__version__ = "2.2.dev0" # TODO use git hash instead for dev version? # __version__ = "1.5.0" -__dfs_version__: int = 210 +__dfs_version__: int = 220 if "64" not in architecture()[0]: diff --git a/pyproject.toml b/pyproject.toml index 0b7793419..8a919ca6e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,14 +3,11 @@ requires = ["hatchling"] build-backend = "hatchling.build" [tool.hatch.build.targets.sdist] -exclude = ["notebooks", "tests", "images"] - -[tool.hatch.metadata] -allow-direct-references = true +exclude = ["notebooks", "tests", "images", ".github", "docs", ".devcontainer", "*.md", "*.txt", ".gitattributes"] [project] name="mikeio" -version="2.1.0" +version="2.2.dev0" dependencies = [ "mikecore>=0.2.1", "numpy>=1.22.0",