From 3d14c4ed7a63768c1584d643e8e0f7a06ea2064b Mon Sep 17 00:00:00 2001 From: Richard Evans Date: Sat, 21 Sep 2024 00:51:07 -0600 Subject: [PATCH 01/12] Updated files --- .github/views.yml | 41 +++++++++++++++++++ environment.yml | 2 +- .../views_test.py => tests/test_views.py | 0 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 .github/views.yml rename oselab/tests/views_test.py => tests/test_views.py (100%) diff --git a/.github/views.yml b/.github/views.yml new file mode 100644 index 0000000..c9c3110 --- /dev/null +++ b/.github/views.yml @@ -0,0 +1,41 @@ +name: Test site functionality +on: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + build: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest] + python-version: ["3.12"] + docker: + - image: circleci/python:3.7.4-stretch-browsers + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + persist-credentials: false + - name: Setup Miniconda using Python ${{ matrix.python-version }} + uses: conda-incubator/setup-miniconda@v3 + with: + miniforge-variant: Mambaforge + auto-update-conda: true + activate-environment: oselab-dev + environment-file: environment.yml + python-version: ${{ matrix.python-version }} + auto-activate-base: false + - name: Build + shell: bash -l {0} + run: | + pip install -e . --user + - name: Test + shell: bash -l {0} + working-directory: ./ + run: | + python -m pytest diff --git a/environment.yml b/environment.yml index 0be88d3..bd009f1 100644 --- a/environment.yml +++ b/environment.yml @@ -1,4 +1,4 @@ -name: oselab +name: oselab-dev channels: - defaults dependencies: diff --git a/oselab/tests/views_test.py b/tests/test_views.py similarity index 100% rename from oselab/tests/views_test.py rename to tests/test_views.py From 3f38fc2c590871c0400c7f1663df6fa70a24629a Mon Sep 17 00:00:00 2001 From: Richard Evans Date: Sat, 21 Sep 2024 00:58:18 -0600 Subject: [PATCH 02/12] Fixed workflow folder --- .github/{ => workflows}/views.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{ => workflows}/views.yml (100%) diff --git a/.github/views.yml b/.github/workflows/views.yml similarity index 100% rename from .github/views.yml rename to .github/workflows/views.yml From 3ee0a66871d6e95a1db16f08d9bbdae305d3adfa Mon Sep 17 00:00:00 2001 From: Richard Evans Date: Sat, 21 Sep 2024 01:00:42 -0600 Subject: [PATCH 03/12] Update view.yml --- .github/views.yml | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 .github/views.yml diff --git a/.github/views.yml b/.github/views.yml new file mode 100644 index 0000000..e114574 --- /dev/null +++ b/.github/views.yml @@ -0,0 +1,41 @@ +name: Test site functionality +on: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + build: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest] + python-version: ["3.12"] + docker: + - image: circleci/python:3.7.4-stretch-browsers + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + persist-credentials: false + - name: Setup Miniconda using Python ${{ matrix.python-version }} + uses: conda-incubator/setup-miniconda@v3 + with: + miniforge-variant: Mambaforge + auto-update-conda: true + activate-environment: oselab-dev + environment-file: environment.yml + python-version: ${{ matrix.python-version }} + auto-activate-base: false + - name: Build + shell: bash -l {0} + run: | + pip install -e . --user + - name: Test + shell: bash -l {0} + working-directory: ./ + run: | + python -m pytest From d2555e0e70caa007b9e14a4c48ce9187340afd75 Mon Sep 17 00:00:00 2001 From: Richard Evans Date: Sat, 21 Sep 2024 01:03:48 -0600 Subject: [PATCH 04/12] Updated views.yml --- .github/views.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/views.yml b/.github/views.yml index e114574..0fbd3f2 100644 --- a/.github/views.yml +++ b/.github/views.yml @@ -1,11 +1,5 @@ name: Test site functionality -on: - push: - branches: - - master - pull_request: - branches: - - master +on: [push, pull_request] jobs: build: From 26f484477f516c6566f793701793ddc03a054ad6 Mon Sep 17 00:00:00 2001 From: Richard Evans Date: Sat, 21 Sep 2024 01:05:05 -0600 Subject: [PATCH 05/12] Updated views.yml --- .github/views.yml | 35 ----------------------------------- .github/workflows/views.yml | 8 +------- 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 .github/views.yml diff --git a/.github/views.yml b/.github/views.yml deleted file mode 100644 index 0fbd3f2..0000000 --- a/.github/views.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Test site functionality -on: [push, pull_request] - -jobs: - build: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest] - python-version: ["3.12"] - docker: - - image: circleci/python:3.7.4-stretch-browsers - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - persist-credentials: false - - name: Setup Miniconda using Python ${{ matrix.python-version }} - uses: conda-incubator/setup-miniconda@v3 - with: - miniforge-variant: Mambaforge - auto-update-conda: true - activate-environment: oselab-dev - environment-file: environment.yml - python-version: ${{ matrix.python-version }} - auto-activate-base: false - - name: Build - shell: bash -l {0} - run: | - pip install -e . --user - - name: Test - shell: bash -l {0} - working-directory: ./ - run: | - python -m pytest diff --git a/.github/workflows/views.yml b/.github/workflows/views.yml index c9c3110..0fbd3f2 100644 --- a/.github/workflows/views.yml +++ b/.github/workflows/views.yml @@ -1,11 +1,5 @@ name: Test site functionality -on: - push: - branches: - - master - pull_request: - branches: - - master +on: [push, pull_request] jobs: build: From 276e1442da9fb2677c2a71cd7a498228bf6033b9 Mon Sep 17 00:00:00 2001 From: Richard Evans Date: Sat, 21 Sep 2024 01:07:46 -0600 Subject: [PATCH 06/12] Updated views.yml --- .github/workflows/views.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/views.yml b/.github/workflows/views.yml index 0fbd3f2..7b5099a 100644 --- a/.github/workflows/views.yml +++ b/.github/workflows/views.yml @@ -1,5 +1,11 @@ name: Test site functionality -on: [push, pull_request] +on: + push: + branches: + - master + pull_request: + branches: + - master jobs: build: @@ -8,8 +14,6 @@ jobs: matrix: os: [ubuntu-latest] python-version: ["3.12"] - docker: - - image: circleci/python:3.7.4-stretch-browsers steps: - name: Checkout uses: actions/checkout@v4 From 28b6bd43f7b1953517235f6bd0fec7577c2c2aa5 Mon Sep 17 00:00:00 2001 From: Richard Evans Date: Sat, 21 Sep 2024 01:09:17 -0600 Subject: [PATCH 07/12] Update views.yml --- .github/workflows/views.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/views.yml b/.github/workflows/views.yml index 7b5099a..64205ca 100644 --- a/.github/workflows/views.yml +++ b/.github/workflows/views.yml @@ -31,7 +31,7 @@ jobs: - name: Build shell: bash -l {0} run: | - pip install -e . --user + pip install -e . - name: Test shell: bash -l {0} working-directory: ./ From e2a3b532d77c4404b4771d5efefc5e87b9aa609a Mon Sep 17 00:00:00 2001 From: Richard Evans Date: Sat, 21 Sep 2024 01:11:40 -0600 Subject: [PATCH 08/12] Updated environment.yml --- environment.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index bd009f1..a2c688b 100644 --- a/environment.yml +++ b/environment.yml @@ -1,8 +1,8 @@ name: oselab-dev channels: - - defaults + - conda-forge dependencies: - - python>=3.7.4 + - python>=3.12, <3.13 - flask>=1.1.2 - Pygments>=2.2.0 - pip @@ -10,3 +10,4 @@ dependencies: - gunicorn - Flask-Assets - Flask-Markdown + - pytest From c1445e4bf7b5ada2c28dfba2f0d00eb1c7bb687f Mon Sep 17 00:00:00 2001 From: Richard Evans Date: Sat, 21 Sep 2024 01:12:35 -0600 Subject: [PATCH 09/12] Update views.yml --- .github/workflows/views.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/views.yml b/.github/workflows/views.yml index 64205ca..847eb0b 100644 --- a/.github/workflows/views.yml +++ b/.github/workflows/views.yml @@ -36,4 +36,4 @@ jobs: shell: bash -l {0} working-directory: ./ run: | - python -m pytest + pytest From 3797637e90251b06a89c6beb87847017ed044887 Mon Sep 17 00:00:00 2001 From: Richard Evans Date: Sat, 21 Sep 2024 01:13:43 -0600 Subject: [PATCH 10/12] Updated views.yml --- .github/workflows/views.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/views.yml b/.github/workflows/views.yml index 847eb0b..e751ed3 100644 --- a/.github/workflows/views.yml +++ b/.github/workflows/views.yml @@ -1,8 +1,5 @@ name: Test site functionality on: - push: - branches: - - master pull_request: branches: - master From 5ff32e65b8a235be99dbab4e7bc3b5c9e92a9bf4 Mon Sep 17 00:00:00 2001 From: Richard Evans Date: Sat, 21 Sep 2024 01:15:35 -0600 Subject: [PATCH 11/12] Removed circleci folder --- .circleci/config.yml | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 6eb30aa..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,9 +0,0 @@ -version: 2 -jobs: - build: - docker: - - image: circleci/python:3.7.4-stretch-browsers - steps: - - checkout - - run: pip install -e . --user - - run: python3 oselab/tests/views_test.py From 29d52b0e4a416a187926b50dce70fb78dada8af4 Mon Sep 17 00:00:00 2001 From: Richard Evans Date: Mon, 23 Sep 2024 08:37:11 -0600 Subject: [PATCH 12/12] Updated setup.py and LICENSE --- LICENSE | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ setup.py | 19 +++++++-- 2 files changed, 137 insertions(+), 3 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..0e259d4 --- /dev/null +++ b/LICENSE @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. diff --git a/setup.py b/setup.py index 4835634..d05a7bc 100644 --- a/setup.py +++ b/setup.py @@ -1,12 +1,25 @@ -from setuptools import setup +import setuptools -setup( +with open("README.md", "r", encoding="utf-8") as fh: + longdesc = fh.read() + +setuptools.setup( name='oselab', + version='0.1.0', + author='Richard W. Evans', + license="CC0 1.0 Universal (CC0 1.0) Public Domain Dedication", + description="Websit for the Open Source Economics Laboratory", + long_description_content_type="text/markdown", + long_description=longdesc, packages=['oselab'], include_package_data=True, + include_packages=True, + python_requires='>=3.12, <3.13', install_requires=[ - 'flask', + 'flask>=1.1.2', 'Flask-Assets', 'Flask-Markdown', + 'Pygments>=2.2.0', + 'gunicorn' ], )