Skip to content

Commit

Permalink
Merge pull request #18 from DunklesArchipel/fix-setup
Browse files Browse the repository at this point in the history
Fix setup
  • Loading branch information
DunklesArchipel authored Feb 27, 2024
2 parents 6d300c6 + 4c2930e commit 669d2b6
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 4 deletions.
44 changes: 44 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Test
on:
push: { branches: [ "main" ] }
pull_request: { branches: [ "main" ] }

concurrency:
group: test-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.remote-data == 'remote' }}
strategy:
matrix:
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
python: ["3.9", "3.10", "3.11"]
remote-data: [""]
include:
- os: "ubuntu-latest"
python: "3.11"
# This leg of the tests runs doctests against the data that is
# currently available on echemdb.org. This test might fail
# when substantial changes have been introduced
# with this run that have not been published on echemdb.org yet.
remote-data: 'remote'
steps:
- name: checkout
uses: actions/checkout@v3
with: { submodules: recursive }
- name: setup conda environment
uses: conda-incubator/setup-miniconda@v2
with:
python-version: "${{ matrix.python }}"
miniforge-variant: Mambaforge
- name: install dependencies
shell: bash -l {0}
run: |
mamba env update --quiet -n test -f environment.yml
conda list
- name: install unitpackage
shell: bash -l {0}
run: |
pip install -e .
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Alternatively you can use the [`unitpackages`](https://echemdb.github.io/unitpac
Install the latest version of the module.

```sh
pip install git@github.com:echemdb/electrochemistry-data.git
pip install git+https://github.com/echemdb/electrochemistry-data.git
```

In your preferred Python environment retrieve the URL via
Expand Down
1 change: 1 addition & 0 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ channels:
- conda-forge
dependencies:
- svgdigitizer>=0.11,<0.12
- python>=3.9
- pip
- pip:
- check-jsonschema
12 changes: 9 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,16 @@
from distutils.core import setup

setup(
name='electrochemistry_data',
name='echemdb_ecdata',
version="0.2.1",
packages=['electrochemistry-data_ecdata'],
packages=['echemdb_ecdata'],
license='GPL 3.0+',
long_description=open('README.md').read(),
description="a Python library to interact with a collection of frictionless datapackages",
long_description=open('README.md', encoding="UTF-8").read(),
long_description_content_type="text/markdown",
include_package_data=True,
install_requires=[
"svgdigitizer>=0.11.0,<0.12.0",
],
python_requires=">=3.9",
)

0 comments on commit 669d2b6

Please sign in to comment.