From 8e70a1540afcb79e37e2b04096190f20fcf9e60d Mon Sep 17 00:00:00 2001 From: Bryan Collazo Date: Sun, 17 Jul 2022 18:45:59 -0400 Subject: [PATCH 1/6] Try testing on pypi --- .github/workflows/python-app.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 6992f898..652d4c27 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -57,6 +57,26 @@ jobs: run: | coveralls --service=github + build-pypi: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up Python 3.8 + uses: actions/setup-python@v2 + with: + python-version: 3.8 + - name: Install dependencies + run: | + pip install -e catanatron_core + pip install -e catanatron_gym + - name: Run sample catanatron-play + run: | + catanatron-play --players=R,W,F,AB:2 --num=2 + - name: Test with pytest + run: | + pytest tests/ + build-ui: runs-on: ubuntu-latest From 5f6c79cb8b6c99b3f086be74ffae14145916ec48 Mon Sep 17 00:00:00 2001 From: Bryan Collazo Date: Sun, 17 Jul 2022 18:50:26 -0400 Subject: [PATCH 2/6] Test just GYM --- .github/workflows/python-app.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 652d4c27..4f4732a4 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -57,7 +57,7 @@ jobs: run: | coveralls --service=github - build-pypi: + build-gym: runs-on: ubuntu-latest steps: @@ -68,14 +68,13 @@ jobs: python-version: 3.8 - name: Install dependencies run: | - pip install -e catanatron_core pip install -e catanatron_gym - - name: Run sample catanatron-play - run: | - catanatron-play --players=R,W,F,AB:2 --num=2 - name: Test with pytest run: | pytest tests/ + - name: Inline test + run: | + python -c "import gym; env = gym.make('catanatron_gym:catanatron-v0')" build-ui: runs-on: ubuntu-latest From 36ec63bfe47e0aa4c27a3c5bcb5f6dd132678729 Mon Sep 17 00:00:00 2001 From: Bryan Collazo Date: Sun, 17 Jul 2022 18:51:22 -0400 Subject: [PATCH 3/6] Skip Pytest --- .github/workflows/python-app.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 4f4732a4..970a976f 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -69,9 +69,6 @@ jobs: - name: Install dependencies run: | pip install -e catanatron_gym - - name: Test with pytest - run: | - pytest tests/ - name: Inline test run: | python -c "import gym; env = gym.make('catanatron_gym:catanatron-v0')" From 25a3652c14cb19db3854a0cda033d9a3a7544521 Mon Sep 17 00:00:00 2001 From: Bryan Collazo Date: Sun, 17 Jul 2022 18:51:40 -0400 Subject: [PATCH 4/6] Assume always published together --- .github/workflows/python-app.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 970a976f..322bebf7 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -68,6 +68,7 @@ jobs: python-version: 3.8 - name: Install dependencies run: | + pip install -e catanatron_core pip install -e catanatron_gym - name: Inline test run: | From 7f19a492ab26479d4ded5f117175fc416665652f Mon Sep 17 00:00:00 2001 From: Bryan Collazo Date: Sun, 17 Jul 2022 18:53:05 -0400 Subject: [PATCH 5/6] Require Gym==0.21.0 --- catanatron_gym/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catanatron_gym/setup.py b/catanatron_gym/setup.py index 90bd9137..839243ad 100644 --- a/catanatron_gym/setup.py +++ b/catanatron_gym/setup.py @@ -22,5 +22,5 @@ "Operating System :: OS Independent", ], python_requires=">=3.6", - install_requires=["catanatron", "gym", "numpy"], + install_requires=["catanatron", "gym==0.21.0", "numpy"], ) From 114feac12789ace41380e65e9b255eae0b352768 Mon Sep 17 00:00:00 2001 From: Bryan Collazo Date: Sun, 17 Jul 2022 18:57:02 -0400 Subject: [PATCH 6/6] Bump to version 3.2.1 --- catanatron_core/setup.py | 2 +- catanatron_gym/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/catanatron_core/setup.py b/catanatron_core/setup.py index 7ebd16e8..26cce63d 100644 --- a/catanatron_core/setup.py +++ b/catanatron_core/setup.py @@ -8,7 +8,7 @@ setuptools.setup( name="catanatron", - version="3.2.0", + version="3.2.1", author="Bryan Collazo", author_email="bcollazo2010@gmail.com", description="Fast Settlers of Catan Python Implementation", diff --git a/catanatron_gym/setup.py b/catanatron_gym/setup.py index 839243ad..1c3cf667 100644 --- a/catanatron_gym/setup.py +++ b/catanatron_gym/setup.py @@ -8,7 +8,7 @@ setuptools.setup( name="catanatron_gym", - version="3.2.0", + version="3.2.1", author="Bryan Collazo", author_email="bcollazo2010@gmail.com", description="Open AI Gym to play 1v1 Catan against a random bot",